Commit Graph

10537 Commits

Author SHA1 Message Date
Chinsky
665aaea722 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into tentacles 2013-05-24 00:43:33 +04:00
Kilakk
ef2c7af6a0 Telescopic baton message fix.
Fixed first- and third- person extend/collapse messages for the
telescopic baton, woo
2013-05-23 16:24:53 -04:00
cib
b5217d862a A few fixes to rp-rev
- Name was empty, hopefully using real_name fixes that
- Announcements coming too quickly
- Fixed icon path issue
2013-05-23 22:12:20 +02:00
cib
c4b8ef6e59 You can't close emagged doors anymore, but you can still remove circuitry. 2013-05-23 20:27:13 +02:00
cib
b1b448e0ee Adjusted event announcement delays.
Also improved some radiation belt announcements.
2013-05-23 20:15:45 +02:00
cib
ce19719700 Fixed two problem with airlock/APC commit:
- Debugger now sends messages to user instead of usr(whoops)
- Can now close emagged door with crowbar so you can take out circuit
- Couldn't weld emagged doors
- Replacing the circuitry should now be sufficient to fix an emagged door.
2013-05-23 19:47:33 +02:00
cib
aa6bfc33c7 Airlock and APC changes.
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
2013-05-23 16:43:29 +02:00
Chinsky
629022f7b0 Fixes #2836
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
2013-05-23 15:06:37 +04:00
Chinsky
8b60bab4a7 Merge pull request #2835 from Roaper/master
No tears, only dreams
2013-05-23 01:55:45 -07:00
Roaper
cb59473d02 Added more dreams to Dreaming.dm
Signed-off-by: Roaper <roaperable@gmail.com>
2013-05-22 13:36:27 -07:00
Chinsky
6ef40ee7a7 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2013-05-22 21:35:50 +04:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	baystation12.dme
2013-05-22 16:51:41 +04:00
Chinsky
bdb16b1f99 Renamed bruise pack back to gauze.
STAY LIKE THAT.
2013-05-22 14:05:53 +04:00
Mloc
80b8a5e70f Merge master.
Signed-off-by: Mloc <colmohici@gmail.com>
2013-05-22 10:53:29 +01:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such.
That lead to knives bruising people you stab, for example.
2013-05-22 12:55:15 +04:00
SkyMarshal
6c8b0c23dc Small fixes, updated changelog. 2013-05-21 23:12:47 -07:00
SkyMarshal
39df196edc Fixed disposal issue.
Delayed Jungle setup until after air master initializes
Master controller now properly ceases atmos simulation if runtimes occur (and are detected).
Cleanup more ZAS stuff.  FEA_system.dm, ZAS/ZAS_Turfs.dm, ZAS_Zones.dm.
Canisters now autoconnect to portables connectors on creation.   (Fixes airlocks not having attached canisters)
Doors can now be made which respect directional door types (e.g. windoors and directional firelocks) and is handled better.
2013-05-21 23:12:47 -07:00
SkyMarshal
46907066ba Somgfkuf 2013-05-21 23:11:54 -07:00
SkyMarshal
3420b0a6fe Cleanup Debug.dm and Functions.dm 2013-05-21 23:11:53 -07:00
SkyMarshal
0ede4e13f9 Cleaned up and commented Connection.dm
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
2013-05-21 23:11:53 -07:00
Chinsky
4885a08b27 Added 5 TC uplink to RevHeads. 2013-05-21 19:24:53 +04:00
Chinsky
1b0c6b942a NOW IT COMPILES.
Incomplete rename.
2013-05-21 18:08:28 +04:00
Chinsky
8b01f8bcc3 Finished up tentacle abominations.
Clone damage will cause body parts to mutate.
The more damage you have, the more chance to get a sweet tentacle.
Healing works other way, the less damage you have, the more chance to unmutate it.
Healing all the damage fixes everything.
2013-05-21 05:40:00 +04:00
Chinsky
1da1592ac2 Merge pull request #2818 from CIB/feature
Space no longer has a heat_capacity
2013-05-20 16:31:52 -07:00
cib
3b09c8b3a6 Space no longer has a heat_capacity
I mean, seriously? Magical realm of heat absorption? Screw that, space is now room temperature!
2013-05-21 00:46:12 +02:00
Chinsky
99fcf1b3be Merge pull request #2819 from Roaper/master
Readded Pockets in the Responder Jackets
2013-05-20 14:34:15 -07:00
Roaper
99ff1f7ee0 Added Pockets to First Responder Jacket
Signed-off-by: Roaper <roaperable@gmail.com>
2013-05-20 13:33:44 -07:00
Chinsky
048c6845e9 Merge pull request #2796 from CIB/report_adjustment
Experimental report balance change
2013-05-20 12:36:50 -07:00
Chinsky
7806915619 Added organ mutations.
Only have sprites for humans yet.
Added is_usable() proc that checks for both limb missing or being a tentacle
2013-05-19 17:56:29 +04:00
Chinsky
e032e3101d Merge pull request #2811 from caelaislinn/xenoarch
Xenoarch tweaks
2013-05-19 04:24:15 -07:00
Cael_Aislinn
1784bcbb04 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:41:18 +10:00
Cael_Aislinn
454d67d899 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:34:10 +10:00
Cael_Aislinn
7067382f52 hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-19 19:12:42 +10:00
Cael_Aislinn
9d17d24063 rewrote fusion reactions to use datums instead of a switch statement (with reaction recipes stored in the master controller for debug editing), restructured fusion recipes to be more balanced + gameplay-centric, rewrote fusion reactions to use (mostly) fictional elements, miscellaneous fixes and cleanup
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-19 19:08:57 +10:00
Cael_Aislinn
751adf7187 miscellaneous rusk tweaks and fixes including: resolved assembly sprite hiding under things, resolved compressor not producing assemblies with the right amount of matter, made injectors able to be rotated, removed cooldown from injector to port assembly swap, made ejected/created assemblies not appear in the middle of walls (being created from wall-mounted machinery),
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-19 19:05:51 +10:00
meyar
ebe2e26ed3 Fixes the Syndicate nuke shuttle airlock (In that it cycles now)
Re-added external airlock access to the traitor ID card, restoring lost functionality.
Fixed the ERT radio. It now works.
2013-05-19 05:00:06 -04:00
Cael_Aislinn
1d9fe082d7 made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-19 18:50:15 +10:00
cib
f5b0b52b6c Added stasis bag.
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
2013-05-19 07:48:43 +02:00
cib
ac8b64734b Fixed a few problems with newscasters. 2013-05-19 07:47:18 +02:00
cib
b6231ec33b Added more community news. 2013-05-19 06:03:39 +02:00
cib
914a9079f0 Added serithi's soundbits as mode sound announcements. 2013-05-19 05:56:18 +02:00
cib
fc20393b60 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	baystation12.dme
2013-05-19 05:54:14 +02:00
MagmaRam
d7876da147 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	icons/obj/custom_items.dmi
2013-05-19 06:21:32 +07:00
cib
8cfc395232 Added community-made newsfeeds.
Yay!
2013-05-18 23:20:20 +02:00
cib
670bf5bb76 Radiation storms consider maintenance now.
Also, a fix to spray(whoops!)
2013-05-18 22:18:37 +02:00
cib
d7cc42e588 Added wallrot event.
Also some updates to changelog.
2013-05-18 21:55:02 +02:00
cib
38cdb4d4f5 Most mobs can emote now.
Also added CSS to say, so that you can tell apart "say" and "me say"
2013-05-18 18:17:28 +02:00
MagmaRam
fbfa125f4b Bugfix: Fixed issues with custom item camera sprites
icond/obj/custom_items.dmi: renamed off sprite for blue camera

code/modules/paperwork/photography.dm: made cameras use variables item_on and item_off for sprites so that other types of cameras (i.e. custom ones) can use their own sprites without getting messed.

/code/modules/customitems/item_defines.dm: set sprites for custom cameras "orange camera" and "old camera" to use item_on and item_off sprites in custom_items.dmi so that they had the correct sprites
2013-05-18 22:00:15 +07:00
cib
8b43fec262 Balance change to suspect list.
Antagonists now have a HIGHER chance to be suspected. Simultanously, traitors and other uplink users get another +4 TC and a warning if they are suspected.
2013-05-18 15:21:14 +02:00
Chinsky
6c062dc05c Merge pull request #2793 from meyar/master
Fixin' the traitor ID
2013-05-18 06:11:46 -07:00