da96fabe25
Fixed json thing
2011-12-12 01:33:47 +10:30
8ede0b3fc6
Fixed a few derps in Poly's commit (namely, the revert back to public vars instead of procs).
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2662 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 12:18:38 +00:00
840bbae1ba
I blame Kor for not submitting this earlier. Dammit, okay. This one works now. Stupid TortiseSVN, why would it do that.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2661 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 08:50:09 +00:00
a4af4ed9d7
Accidently reverted someone else's changes with my last commit. This commit has both sets of changes included.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2660 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 08:44:43 +00:00
df1d12c368
Adds a cooldown to changeling lesser form. (30 seconds)
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2659 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 08:31:45 +00:00
b411ecf570
Merge pull request #95 from Strumpetplaya/master
...
Greatly increased the chance for breath mask and oxygen tank to spawn in O2 closets
2011-12-11 00:25:50 -08:00
9b42ef2db8
Merge pull request #94 from headswe/master
...
Made blob take damage from airbased fire hopefully.
2011-12-11 00:25:00 -08:00
5314bd707c
Greatly increased the chance for breath mask and oxygen tank to spawn in
...
O2 closets.
Also redid Radiation suit change. It seemed to get messed up by /tg/
update I guess.
2011-12-11 00:37:54 -05:00
98abc51b5a
"Now warns admins when people spray polyacid/space lube (Done for Quarxink)" -- credit to Polymorph
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2657 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 04:08:12 +00:00
99e2894d01
Made the blob take damage from fire.
2011-12-11 02:21:51 +01:00
87bc81ced5
Small changes and bugfixes:
...
◦ Metroids can now be observed by ghosts.
◦ Saved User Interface preferences ("Old UI" & "New UI") now correctly get transferred to clones.
◦ Captain announcements now require the player to be next to the console. (Issue 220)
◦ Radio headsets no longer sometimes fail to deliver the messages (Issue 221)
◦ Some other insignificant back-end shenanigans.
◦ The pregame lobby now has title music. The gameticker chooses between two .ogg files on game start and plays that for everyone who joins. The music stops when create_character() gets called though.
◦ Gave some critters, namely "creature" and "blob" some attack sounds.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2655 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-10 19:34:49 +00:00
32811b1b9d
Fixed runtime error involving cyborgs and fibers.
...
Also changed Show Server Revision at Head's request. Can't really test it
locally so hopefully this is what he meant.
2011-12-10 11:27:48 -05:00
c2eaca7b29
Removed all global modifications of toxloss.
...
Added a setToxLoss() proc.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2653 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-10 14:36:08 +00:00
41dedca7b9
Merge pull request #85 from Tastyfish/master
...
added categories to QM ordering/request stuff so it isn't a giant several-page list
2011-12-10 02:42:21 -08:00
c68a22f497
Merge branch 'SkyMarshal-764432e'
2011-12-10 12:35:15 +02:00
6c992058e4
Code cleanup + gravitational anomaly readded
2011-12-10 11:59:40 +02:00
64106be003
Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90
...
Lot of tweaks and fixes, read the description.
2011-12-10 01:43:34 -08:00
61ae382c16
added categories to QM stuff so it isn't a giant several-page list
2011-12-10 01:25:27 -05:00
b8ef575274
Jetpack changing to wrong sprite when turned on fixed.
...
Syringes will autochange inject/draw when full/empty.
Medborg syringes start full and set to inject even though the icon is still messed up.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-09 20:33:25 +00:00
3efa552eda
Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/larva/life.dm
2011-12-09 14:56:32 +02:00
58265c8629
Hastur Robes (yellow costume) removed from chaplains closet at Urist's command/request.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2649 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-09 06:17:26 +00:00
61d21b3cab
Added the ability for borgs to ude departmental radios
2011-12-08 22:02:46 -07:00
8f11c4acfb
DO NOT USE.
2011-12-08 17:07:25 -07:00
3319b22adf
Remove killbot ref. when you make an ED-209, reversed list order for QM requests and orders.
2011-12-08 15:08:03 -07:00
b5018a8aa3
Removed thermals from traitor objectives.
2011-12-08 14:29:21 -07:00
dafbfe6edd
Replaced an accidentially blanked part of flavor text
2011-12-08 14:25:24 -07:00
009d0915bf
Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin)
2011-12-08 14:22:45 -07:00
ff8ca07714
Removed accelerated shuttle launch.
2011-12-08 14:05:14 -07:00
6f88b4f981
Forgot to remove the entry from the table the random event switch looks at.
2011-12-08 13:57:26 -07:00
0da1bea7c0
Add BS12 Space Law, remove Gravitational Anomaly event
2011-12-08 13:51:10 -07:00
d7eb6e4ae6
Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker
2011-12-08 12:35:10 -07:00
dd6ddaa8c3
Revert "removed cloaker"
...
This reverts commit 1fa97843f8
2011-12-08 15:28:35 +02:00
b30bfac8f9
- added feedback logging for alert levels
...
- alert level descriptions are now part of the config file config.txt
- alert levels default to the ones I had before, if the config file isn't configured.
- Restored a HTML vending machine interface, an updated one. (I have limited time so I'll commit this one too, it's part of the bundle i coded while offline today and I don't have time to separate it before discussing it. I'll revert it later if needed)
Vending machine demo:
http://www.kamletos.si/vending.html
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2641 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-08 11:09:01 +00:00
cc59093135
This should fix the cloning issue. (See: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=6502 )
...
Special thanks to the kind folks over at Bay12 for spotting the problem.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2638 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-08 00:46:15 +00:00
1fa97843f8
removed cloaker
2011-12-07 12:29:04 -05:00
e51459600f
Merge remote-tracking branch 'upstream/master'
2011-12-07 11:21:50 -05:00
79c84c9d23
Cloning fixed.
2011-12-07 05:40:33 -05:00
455b61d9c8
hand labelers have been broken since the first commit..
2011-12-07 00:32:02 -05:00
810dbd7346
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2634 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-07 00:53:09 +00:00
73aa4a1afa
hotfix for comms console locking up when you try to change the alert level...
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2632 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 22:43:15 +00:00
8636f28d7d
In response to the problems of miner inactivity and a suspicion of the steel change affecting robotics in that mechs, specifically ripleys will no longer be built, I have included some stats logging about mecha construction and mineral production.
...
Also made steel and reinforced glass correctly decrease ore amounts.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2631 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 22:33:23 +00:00
af301633f6
Merge branch 'master' of git://github.com/Abi79/tgstation13-git
...
Conflicts:
baystation12.dme
code/defines/obj/vending.dm
code/game/machinery/vending.dm
html/changelog.html
maps/tgstation.2.0.8.dmm
2011-12-07 07:53:20 +10:30
92045315a3
Merge pull request #72 from Strumpetplaya/master
...
Security now has maintenance access.
2011-12-06 09:46:00 -08:00
cb19629c18
Wrenches no longer spawn with a random pixel offset to the right.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2628 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 14:39:19 +00:00
508df5d3cb
Nobody spawns with internals anymore.
2011-12-06 07:35:33 -05:00
4489db546d
Added detective stuff - fibers.
...
Left out bloody footprints for now. Not sure we want that with the
current system of corpses dropping blood spatters all around when dragged.
2011-12-06 07:12:19 -05:00
bbd04aa2aa
Security now has maintenance access.
...
Security also has access to medical/research hallways.
Assistants no longer have maintenance access.
2011-12-06 06:04:34 -05:00
4764cdc990
Aliens:
...
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 08:30:03 +00:00
07dac128c1
Gyrojet bolts now explode on contact with mobs and walls.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2626 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 04:50:42 +00:00
68c6b97fd3
everyone cult!, paper label
2011-12-05 23:19:39 -05:00
Miniature