Giacomand
c27070ff18
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1704
...
Conflicts:
maps/tgstation.2.1.2.dmm
2013-11-08 22:55:23 +00:00
Cheridan
2c4f15bdbd
Cleaned up the UI and fixed bugs.
...
fixed up the GPS lists.
Added another Telescience area.
Fixed one final bug.
fixed some bugs
fixed a bug
Fixed a fuck ton of Bugs and Issues. Heavy thanks to SuperSayu for helping fix the code, along with Giacom.
Added 2 new Telescience only areas, and gave the BIG BAD BADMINS a investigate log each time someone teleports with Telescience. This logs the destination coordinates and the area it was in.
Fixed some bugs, and set the new stuff on a BRAND NEW 7th Z-LEVEL! Now you guys cant get to it falling out of the shuttle anymore.
Fixed some bugs.
Added Cosmic Anomalies on the empty Z-Level for you to find during Telescience! I also fixed some bugs.
Fixes a bunch of bugs. Don't pull yet, Telescience stuff is on the way!
fixed another issue
Fixed more issues
Fixed issues.
Adds Telescience! It is also added to the map where Misc. Research was.
Merge pull request #1682 from Giacom/active_player_serverstatus
Adds the active players for when you are getting the server status.
2013-11-08 22:54:34 +00:00
Giacom
36b6e08ec6
Merge pull request #1715 from AlexanderUlanH/labor-remap
...
Labor remap/Bugfixes [MAP]
2013-11-08 12:30:39 -08:00
Giacom
00e087e6d7
Merge pull request #1718 from Rockdtben/ListFreeSlots
...
The admin tool "List Free Slots" popups now instead of flooding the chat...
2013-11-08 11:29:38 -08:00
Rockdtben
c11523c093
Remove list_free_slots.dm
2013-11-07 18:19:38 -06:00
Giacom
9f5f30eb68
Merge pull request #1670 from Cheridan/Bugs
...
Bugfixes
2013-11-07 09:08:57 -08:00
Rockdtben
6bdb91a042
The admin tool "List Free Slots" popups now instead of flooding the chat window.
2013-11-07 08:43:19 -06:00
Giacom
00621f7817
Merge pull request #1671 from Neerti/hud_addition_01
...
Adds a plasma storage HUD for aliens.
2013-11-07 04:25:28 -08:00
AlexanderUlanH
f31f7092c8
[MAP] Mining fixes and a remap
...
I don't even know what's going on oh god
2013-11-06 23:26:46 -05:00
Cheridan
22e59767cb
Merge pull request #1686 from Jordie0608/WakeUpTheKing
...
Fixed up Scanning Module naming
2013-11-06 19:43:10 -08:00
Cheridan
655e841239
Merge pull request #1693 from Giacom/fix_1691
...
Fixes #1691 by limiting the show_message proc.
hey so can i just type whatever i want in here when i merge something?
2013-11-06 16:15:09 -08:00
Cheridan
c46fd846ce
Merge pull request #1652 from Perakp/securityClothing
...
Security clothing crate
2013-11-06 15:12:36 -08:00
Cheridan
c0566016d5
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1701
2013-11-06 11:03:40 -06:00
Cheridan
3f8a9bb6ec
Merge pull request #1706 from errorage/2013-11-04-deleted-column-added-to-library-table
...
Adds the framework to soft-delete books from the library
2013-11-05 22:01:05 -08:00
Giacom
eeeeedfc8b
Merge pull request #1699 from AlexanderUlanH/siberia2
...
Labor Camp [MAP]
2013-11-05 11:23:56 -08:00
AlexanderUlanH
a985620707
Updated the labor camp
2013-11-05 14:13:21 -05:00
errorage
b60526ca10
- Adds the framework that allows soft-deleting books from the library.
2013-11-04 23:46:46 +01:00
AlexanderUlanH
6a05692075
Removed unnecessary check
...
Doopiddy doop, thanks Kaze.
2013-11-04 14:52:44 -05:00
AlexanderUlanH
cd4a6af6b1
Fixes another DNA runtime
...
Public service announcement: check_dna_integrity(mob) before trying to
touch mob.dna.
2013-11-04 14:40:18 -05:00
Cheridan
729dea43a2
Fixes up the implant removal messages, replaces names with paths in uplink_item.dm
2013-11-04 09:58:04 -06:00
Cheridan
637e7f72c9
Nuke Op Population Scaling and Content Update
...
to be edited
2013-11-03 16:41:57 -06:00
AlexanderUlanH
16d17921f9
Cha-cha-cha-changes
...
Changed the shuttle controller to a datum, changed the appearance of the
labor shuttle, and fixed stackers giving one free stack of each ore.
2013-11-02 17:01:54 -04:00
AlexanderUlanH
87b72833bd
Added the labor shuttle
2013-11-02 15:16:39 -04:00
Perakp
c4b6e8ba3c
Changes Head of Security hat to lower case.
...
Removes useless jumpsuit hiding flags from security jackets.
2013-11-02 13:22:00 +02:00
sirbayer
c6c1dbd363
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-improvedprojectiles
2013-11-01 20:32:04 -07:00
Giacomand
476b64bd76
Fixes #1691 by limiting the show_message proc.
2013-11-01 23:51:00 +00:00
sirbayer
6cb100382c
Removed potential runtime from spawning projectile/shotgun. Also made it so shotguns actually load shotgun shells.
2013-11-01 14:45:36 -07:00
Jordie
e6b7abed53
Fixed up Scanning Module naming
2013-11-01 17:23:49 +11:00
Giacom
d77963bc43
Merge pull request #1683 from Miauw62/borgshaker
...
Improved cyborg shakers.
2013-10-31 05:56:05 -07:00
sirbayer
19e51caef0
Modification of .gitignore to include admins.txt. Hopefully.`
...
Added myself to admins.txt for testing.
Merge branch 'srsbsns'
Fucking finally figuring out how to make admins.txt be ignored.
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
stuff
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
latest setting for tgstation.dme
deeply do I loathe these files
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
God I hate gitignore
Merge branch 'master' of https://github.com/tgstation/-tg-station
Modification of .gitignore to include admins.txt. Hopefully.`
Added myself to admins.txt for testing.
Merge branch 'srsbsns'
Fucking finally figuring out how to make admins.txt be ignored.
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
stuff
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
latest setting for tgstation.dme
deeply do I loathe these files
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
God I hate gitignore
Merge branch 'master' of https://github.com/tgstation/-tg-station
Modification of .gitignore to include admins.txt. Hopefully.`
Added myself to admins.txt for testing.
Merge branch 'srsbsns'
Fucking finally figuring out how to make admins.txt be ignored.
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
stuff
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
latest setting for tgstation.dme
deeply do I loathe these files
Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
config/admins.txt
God I hate gitignore
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles
Conflicts:
config/admins.txt
data/investigate/singulo.html
I don't what I'm doing
Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.
Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.
Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.
Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.
Sprite tweaks for final preparations for pull request.
final FINAL finalizations.
Adding full paths to overwritten procs for simplicity's sake.
Fixing damaged .gitignore and config/admins.txt.
Finalization for pull preparation. Clean up some descs, eliminate data folder.
2013-10-30 17:56:00 -07:00
Miauw
e543604d2b
Improved the new cyborg shaker.
2013-10-30 21:55:05 +01:00
Giacomand
dc8f30b1ec
* Removed the deleted files from vox_sounds.dm
2013-10-30 19:44:17 +00:00
JJRcop
402733f3b8
Made period and comma sounds completely silent, and turned them Vorbis
2013-10-30 14:50:28 -04:00
Giacomand
58678a7f3b
Merge branch 'master' of https://github.com/tgstation/-tg-station into ai_vox_boogaloo
2013-10-30 15:22:14 +00:00
Aranclanos
2888ade897
Merge pull request #1655 from Giacom/robot_violin
...
Added the space violin to the service cyborg modules + MORE [CHANGELOG]
2013-10-30 08:19:22 -07:00
Aranclanos
033248d216
Merge pull request #1648 from Giacom/field_gens
...
Field Generator/Containment Field Changes [MAP] (Fixes #205 )
2013-10-30 04:29:19 -07:00
Cheridan
f9907e5fce
Merge pull request #1674 from Giacom/dis_tiny_fix
...
Validates the spray bottle is still on the user when emptying.
2013-10-29 23:14:05 -07:00
Giacom
3efaff62ba
Merge pull request #1668 from AndroidSFV/Fix633
...
Resolves #633
2013-10-29 14:42:56 -07:00
Miauw
04faefd5d9
Improved cyborg shakers. They now synthesize all base drink ingredients.
2013-10-29 22:02:00 +01:00
Cheridan
1f27f5f670
Merge pull request #1667 from AndroidSFV/fix636
...
Resolves #636
2013-10-29 08:11:09 -07:00
Giacomand
9b2437aa71
* Validates the spray bottle is still on the user.
2013-10-28 17:29:09 +00:00
Giacom
1e470a74d4
Merge pull request #1660 from MIC132/SpaceCleanerFix
...
Simple fix to the fact that you can't clean with Space Cleaner using mop.
2013-10-28 05:38:28 -07:00
Giacom
eff970ba7b
Merge pull request #1657 from Jordie0608/veryspooky
...
Space Bats
2013-10-28 05:37:33 -07:00
Neerti
a1053c2b56
Adds a plasma counter hud for aliens that works similar to the changeling's chem storage and blob's resource storage counters.
2013-10-28 03:03:33 -04:00
Cheridan
bad46f62ba
-Fixes issue 1462
...
Adds an update icons call to cloakers
-Fixes issue 1387
Clonees get healed of all damage types while in the pod.
2013-10-27 22:02:22 -05:00
AndroidSFV
3144b54e92
Fixes #633 . Problem was a null.loc runtime from the chair being disassembled.
2013-10-27 19:37:38 -05:00
AndroidSFV
2fe27c0167
Fixes #636 . A wrapped package never ever had a w_class other than 3.
2013-10-27 19:03:51 -05:00
Rockdtben
1965079bd9
Merge pull request #1654 from Perakp/testBranch
...
Empty staves whizzle instead of *click*
2013-10-27 07:41:31 -07:00
Perakp
883039b66b
Changed admin.txt back to normal, resolves merge abortions (I hope)
2013-10-27 17:53:37 +02:00
Perakp
ed16e1df09
Merge branch 'testBranch' of https://github.com/Perakp/-tg-station into testBranch
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/energy/special.dm
2013-10-27 17:50:15 +02:00
