Commit Graph

2116 Commits

Author SHA1 Message Date
Ren Erthilo
c8fca21dab TG: Blob ending number of blobs is now a var.
The nuke now properly checks to see if its on the station when it explodes and
most of the derp var has been removed from the bomb code. r2913
2012-04-09 12:54:15 +01:00
Ren Erthilo
eee2057453 TG: Shades now properly ghost people when they die.
Changed a nuke feedback back to what it was.
SMES code slightly cleaned up.
Removed a few of the HIGH VOLTAGE signs that were on grilles.
Added a san check to hydro to remove a runtime. r2910
2012-04-09 12:44:56 +01:00
Ren Erthilo
111e748c34 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-04-09 11:24:10 +01:00
Albert Iordache
f15bf584c4 Antagonists wearing Syndicate ID cards are now marked as such in the player panel. Fixes #800 2012-04-08 23:07:21 +03:00
Albert Iordache
7049cd4391 Fixed a compilation error. 2012-04-08 21:24:23 +03:00
Albert Iordache
6e6fd14578 Fixed a blood drip related runtime error. 2012-04-08 20:54:57 +03:00
Albert Iordache
29d19df962 Trying to figure out a virus2 related runtime error 2012-04-08 20:45:35 +03:00
Ren Erthilo
ad590fbbc4 Fixes setting status display from comms console. Messages can now be sent to CentCom (admins) using comms console, and the Syndicate (also admins) when emagged. This functions like a prayer. 2012-04-08 12:20:14 +01:00
Ren Erthilo
d14a05f7b0 Hotfix for virology. 2012-04-08 09:23:49 +01:00
Ren Erthilo
61cc933a38 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-04-08 08:06:03 +01:00
cib
007b4849de Bugfix: No, new/list is not a way to create lists! (Probably fixes virology) 2012-04-07 20:28:43 -07:00
Ren Erthilo
5a3ba543e4 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-04-07 22:29:13 +01:00
Ren Erthilo
36991d7644 Adds a variety of cool belt bags. Fixes chemist jumpsuit world icon. 2012-04-07 19:46:49 +01:00
Head
844300f0f9 Fixed admin jump/get mob 2012-04-07 17:41:03 +02:00
Ren Erthilo
d52701ee84 Adds objects: office chairs, feathery pen, glass and normal research airlocks, showers, styrofoam cups. Adds clothes: Fez, cheerleader outfits, captain mal uniform, hazmat suits, wedding dress, AI bliss icon. New icons for captain, head of security, security, and warden's lockers. 2012-04-07 09:58:54 +01:00
Albert Iordache
e285612c4f Moved the age var from humans to /mob/living 2012-04-07 00:24:53 +03:00
SkyMarshal
5b3ad2a925 Made transformations between mobs with organs work better. Destroying a limb removes implants. Implants now go where you select. Fixed some runtimes and retardedness. 2012-04-05 21:55:41 -07:00
SkyMarshal
e8f5e13bd2 Further improved stuff for dealing with associative lists. You can now modify the contents of an associative list. Removed static background noise. Added CarbonCopy command from oldcode. 2012-04-04 23:02:24 -07:00
SkyMarshal
9b1f50bf35 Merge branch 'master' of github.com:Baystation12/Baystation12 into Airlocks 2012-04-04 19:58:59 -07:00
SkyMarshal
9b80544204 Small timestamp change 2012-04-04 19:58:44 -07:00
Ren Erthilo
ebebfaabb3 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/modules/mob/mob_defines.dm
2012-04-04 20:19:23 +01:00
CIB
0e4690938b Merge pull request #786 from SkyMarshal/Airlocks
Adds dismemberment to Tajarans and Monkeys.  Added some sanity checks to prevent people from punching you when they are missing hands.  Fixed more wound stuff.  Some examine fixes.
2012-04-04 05:21:54 -07:00
SkyMarshal
f009f9928c More fixes and improvements. Removed several "src."s, added some proper sorting for mobs on player lists stuff and admin stuff. Added a timestamp to player info/notes, made flavor text play nice with the new examine system. Nerfed stunning against armored targets. 2012-04-03 21:22:21 -07:00
Ren Erthilo
478a462e3a Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-04-03 19:42:41 +01:00
SkyMarshal
9e694e545b Some more changes/improvements. Proper torso sprite for monkeys 2012-04-02 21:52:30 -07:00
SkyMarshal
5b20f6a2fd Adds dismemberment to Tajarans and Monkeys. Added some sanity checks to prevent you from punching you when they are missing hands. Fixed more wound stuff. Some examine fixes. Adds a hasorgans proc which checks if the given argument is a mob with organs. Fixed pathing for guncode. 2012-04-02 19:44:43 -07:00
SkyMarshal
0bc5215944 Merge pull request #779 from Erthilo/master
Adds more notice boards, CE space suit, patient gowns. Fixes chef apron and hot chocolate sprites.
2012-04-02 10:40:20 -07:00
Ren Erthilo
f4018ccf73 Fixes being able to devour monkeys as a human. 2012-04-02 18:34:47 +01:00
Ren Erthilo
5829378d8a Merge branch 'master' of github.com:Erthilo/Baystation12 2012-04-02 02:53:57 +01:00
SkyMarshal
cefd345840 Adds in traitorous music verb, single use, local sound, as well as removing some debugging info. 2012-04-01 16:58:21 -07:00
Ren Erthilo
af9a80cce4 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/modules/mob/mob_defines.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/storage.dmi
	maps/tgstation.2.0.8.dmm
2012-04-02 00:37:54 +01:00
SkyMarshal
aece74cdf3 Fixed some debugging info. 2012-04-01 12:35:32 -07:00
Ren Erthilo
2e711e992f Small description fix. 2012-04-01 07:41:36 +01:00
Ren Erthilo
b9e03234ea Added unique CE space suit to engineering. Added notice boards to many areas. Adds patient gowns to patient's closets. Fixes to chef's apron and suit names. 2012-04-01 07:30:33 +01:00
SkyMarshal
cd4a82a90b Fixes for the fingerprint runtimes, other runtimes, the new damage system, and the new objective system, to reduce the super hard objectives. 2012-03-31 22:01:21 -07:00
SkyMarshal
a90173c628 Part one of bugfixes for the new damage system. 2012-03-31 22:01:21 -07:00
Ren Erthilo
a1b235cf36 Fixed syringes not updating. Added missing vomit sprites. Added missing syringe sprites. 2012-03-31 01:05:24 +01:00
Ren Erthilo
4c8d454a45 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-30 23:58:50 +01:00
Ren Erthilo
ae57f8db64 Merging SkyMarshal's stuff. 2012-03-30 16:26:04 +01:00
Ren Erthilo
7cf7c7775a Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-03-30 06:18:37 +01:00
Ren Erthilo
abeea22566 Rebalanced beer and made ethanol the base alcohol. Slightly tweaked alcohol effect rates. 2012-03-30 05:52:18 +01:00
Ren Erthilo
aba0e9d8f6 Adds advanced medical kit sprites and uses. Will be in-game later. Also fixes security rig inhands. 2012-03-30 05:47:38 +01:00
SkyMarshal
08a060501b Merged in Erthilo's stuff. 2012-03-29 21:11:17 -07:00
Ren Erthilo
4a0236734b Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-30 04:50:06 +01:00
SkyMarshal
0c34286018 Fixes errors from last commit. 2012-03-29 20:44:11 -07:00
SkyMarshal
61820bc5ec Final commit of the examine/damage overhaul. 2012-03-29 20:44:10 -07:00
SkyMarshal
01d2d5f339 WIP bloodloss and scaring system. 2012-03-29 20:42:08 -07:00
Ren Erthilo
fa49d4514f Missed one. 2012-03-30 04:24:28 +01:00
Ren Erthilo
6952bef874 Reverting disabilities, headsets, murder sydie pack, photo removal, isbreathing and internals. 2012-03-30 04:19:22 +01:00
Ren Erthilo
63c027aca9 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-03-29 08:37:47 +01:00