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
f0a819131b
Refixes AI Alarm ID problem.
2012-04-04 20:37:20 +01: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
Mloc
238a2e99a8
Merge pull request #785 from comma/master
...
Sirens not haunting you after shuttle gets recalled.
2012-04-03 03:17:45 -07: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
comma
77a71abdc7
Fix: Siren sound now not playing after shuttle been recalled.
...
If you called shuttle and then recalled it, you had to listen to the siren anyway, every 90 seconds till the round end.
2012-04-02 23:00:09 +03: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
4e6f222072
Merge pull request #784 from SkyMarshal/Airlocks
...
Reverted traitorous music verb.
2012-04-01 17:13:43 -07:00
SkyMarshal
5b65826ec4
Reverted traitorous music verb.
2012-04-01 17:12:38 -07:00
CompactNinja
027fc90a8c
Merge pull request #783 from SkyMarshal/Airlocks
...
Fixed some left in debugging info, added a single use traitor verb to play traitor.ogg locally.
2012-04-01 17:07:39 -07:00
SkyMarshal
0fe5806191
Small edit
2012-04-01 17:00:37 -07: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
Ren Erthilo
c3ed6d443d
Reverts the freezer code and the airlock code.
2012-04-01 23:24:59 +01:00
Albert Iordache
c9536305f8
Merge pull request #778 from SkyMarshal/Airlocks
...
New damage system and objective system fixes, further bugfixes #776 , #775 , and #772
2012-04-01 12:49:38 -07:00
SkyMarshal
aece74cdf3
Fixed some debugging info.
2012-04-01 12:35:32 -07:00
SkyMarshal
c1262a004c
Removed unused variable I forgot about.
2012-04-01 09:13:20 -07:00
Mloc
addafbe34c
Merge branch 'master' of github.com:Baystation12/Baystation12 into zas
2012-04-01 14:54:45 +01:00
Mloc
3563132fb5
POD WINDOWS. Also a ZAS fix that I forgot to commit.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2012-04-01 13:37:51 +01: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
comma
07b26ee6b4
Calling shuttle now turns red lights in hallways (a bit different from fire alarm one).
...
Also every 90 seconds siren is played.
2012-04-01 07:27:17 +03: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
477ec2b394
Edited storage books and bibles to be more like boxes.
2012-03-30 16:52:14 +01:00
Ren Erthilo
ae57f8db64
Merging SkyMarshal's stuff.
2012-03-30 16:26:04 +01:00
Ren Erthilo
321f16eccb
Merge fixes for NOCLONE, attack logs and map changes.
2012-03-30 06:46:01 +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
16fcbbc3b3
Fixed metroids being slipped and stepping in glass shards. Wearing a suit with shoes now protect from glass shards. Surgery can now be done on roller beds, and doing it on normal tables has a slightly higher chance of working.
2012-03-30 05:57:30 +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
ab575b2fe1
Fixes the no-original-name cloning bug.
2012-03-29 21:27:39 -07:00
SkyMarshal
08a060501b
Merged in Erthilo's stuff.
2012-03-29 21:11:17 -07:00
SkyMarshal
b24d17ddeb
Fixed a small error.
2012-03-29 21:00:06 -07:00
Ren Erthilo
4a0236734b
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-03-30 04:50:06 +01:00
Ren Erthilo
a87ad6b291
Reverted electric chair changes.
2012-03-30 04:47:46 +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
