Commit Graph

1746 Commits

Author SHA1 Message Date
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
Ren Erthilo
75a0bb49b7 Fixes for viewing skills mid-round. Changed title capitalisation. 2012-03-29 01:57:31 +01:00
Miniature
b15a978b99 durp 2012-03-29 11:21:04 +10:30
Miniature
34bd0cd46b More custom items, for Serithi and Gvazdas. 2012-03-29 10:31:09 +10:30
Ren Erthilo
78b9e9928a Reverts descriptions/names and old syndicate uplink. Adds sprites for advanced medical items. 2012-03-28 22:52:00 +01:00
Ren Erthilo
276fc39010 Adds message for people breaking out of cuffs. 2012-03-28 09:57:49 +01:00
Ren Erthilo
bbc40f27ee Some merge fixes, changed Malf laws to regular AI ones, changes for the AI and Cyborgs hints, and an actual fix for implanting rev heads. 2012-03-28 03:45:36 +01:00
Ren Erthilo
c578b76935 Merge cleanup. 2012-03-28 01:12:34 +01:00
Ren Erthilo
0d1412efdf TG: Fixed some runtimes.
Virus2 has been effectively removed from the code as it was not actually used
and was causing some runtimes.
The PA is now properly affected by meteors/blobs/bombs. r2903
2012-03-27 06:34:33 +01:00
Ren Erthilo
5fabd286d1 TG: Added Invisty's Emitter sprites.
Cleaned up part of the door code and moved some defines to their proper files.
Firelocks can now be welded open and now shows the welded overlay properly.
Borgs can now properly mess with door wiring. r2895
2012-03-27 05:50:15 +01:00
Ren Erthilo
06394fe66b TG: Fix for Issue 276 . Pregame music stops playing for AIs. r2893 2012-03-27 03:52:19 +01:00
Ren Erthilo
09204ad111 TG: Mecha no longer crush their occupants if you switch to internal pressure.
(Normally.)
Bugfix:  Not all suits now protect from air pressure. r2887
2012-03-26 23:57:50 +01:00
Ren Erthilo
dd2b3cc816 TG: Added two new variables, "canstun" and "canweaken". They can be modified in
runtime to prevent mobs from ever being weakened and stunned by
tasers/batons/electrified doors.

Xenos are immune to stunning and weakening. This basically means you cannot run
up to a xeno and shoot them with a taser and game over. This makes them a lot
more dangerous. To compensate, I've added in a xeno-exclusive variable
controlling movement delay addition. When a xeno is stunned, its movement speed
goes down. The speed is recovered in the life() proc.

Modifications to critter.dmi (manhacks). Added a new lighting icon, floor
lights. Possible implementation later. r2886
2012-03-26 23:51:00 +01:00
Ren Erthilo
2ff1133024 TG: Moved a proc from mob_defines to mob_cleanup going to be implementing
organstructure soon and needed to clean the workspace.

mob_cleanup.dm will hold procs that are dirty and need to be written in a
cleaner matter. (No insult to original writers) r2885
2012-03-26 23:39:53 +01:00
Ren Erthilo
81f76406a3 TG: toxloss is now only referenced via procs. r2875 2012-03-26 23:23:46 +01:00
Ren Erthilo
e6b85575f6 TG: brainloss is now only referenced via procs. r2874 2012-03-26 23:20:45 +01:00
Ren Erthilo
add06af9fd TG: cloneloss is now only referenced via procs. r2871 2012-03-26 23:11:56 +01:00
Ren Erthilo
8d03d460aa TG: Moved a batch of unchecked and a few unused files into the unused folder.
Remember if your scrolling though the list and something is unchecked it should
almost certainly be checked.
Simple animals moved over to the actual mob code area and out of the defines. r2868

Also added a bunch of files I forgot.
2012-03-26 23:01:03 +01:00
Ren Erthilo
1ea153f504 TG: Emitters can be emag'd.
You need to swipe and ID to lock an emitter,
PDAs will no longer have a popup when you attempt to put an ID into them.
PDAs have an Update Info button just below the ID slot when an ID is in it. r2867
2012-03-26 22:39:05 +01:00
Ren Erthilo
f7e8bcd591 TG: Emitters emp_act now uses severity properly.
The PA can no longer be remotely controlled by humans and cyborgs can only
control it if they are nearby.
The spawn PA can now be taken apart.
FireAx/Extinguisher closets got their own files.
Food closets are now with their defines.
Freezer closet/crates override return_air() to cooldown the contents.
The var isinfreezer has been eliminated.
The old player panel has been readded as an alt for the new one, it may be found
under the Player Panel verb.
The new player panel may be accessed by the Player Panel-New verb.
Crates.dm moved from the storage folder as it is not a storage object.
Fixed  Issue 227  about the PA shooting when it should not be. r2851
2012-03-26 18:46:08 +01:00
Ren Erthilo
ab9f1cc121 Small Merge Fixes. 2012-03-26 18:16:37 +01:00