Commit Graph

1122 Commits

Author SHA1 Message Date
SkyMarshal
1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
2012-02-08 12:13:03 -07:00
SkyMarshal
ffb142abae Secure Airlock update!
4 new wires, completely randomised! (2nd bolt wire, 2 only-drop-bolts wires, and an AI alert wire that alerts an AI 20% of the time, when messed with)
Emags have a limited number of uses, between 3 and 7, and cost 5 TC
Hacktools are more useful than they were, and have a lower chance of alerting the AI
(This is unmapped ATM)
2012-02-08 12:07:12 -07:00
Melvin Melonstorm
f8f3f290c5 Fixed a bug with the wardrobe, changed a lot of strings and added a seal for the wardrobe, allowing people to check whether a wardrobe has been opened before or not. 2012-02-08 19:15:10 +01:00
CaelAislinn
b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache
e96e8bc19d Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm 2012-02-08 08:10:15 +02:00
CaelAislinn
22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 11:47:07 +10:00
Albert Iordache
7df0181e60 Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity 2012-02-07 20:05:43 +02:00
Albert Iordache
a20481062c Cleaned up parts of the code, no other changes 2012-02-07 20:05:42 +02:00
SkyMarshal
e432958ab5 Bugfixes for airlocks
Added detective work manual, that spawns on top of the detective's computer
Added RadioAlert proc
Added the capability to title the NanoTrasen updates
2012-02-06 20:24:00 -07:00
SkyMarshal
1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07:00
SkyMarshal
85ee6ae562 Fixed a warning with meteors, HAWK: COMPILE DAMMIT
Blood now works properly.
2012-02-05 11:52:42 -07:00
Albert Iordache
b2120f22e9 Merge pull request #368 from CIB/master
Erthilo's sprites
2012-02-05 06:23:39 -08:00
SkyMarshal
2074313f7f Updates to cigarettes and cigars
Tables can now be thrown past
You can now put something in a disposal unit by throwing at it.
2012-02-04 18:24:22 -07:00
SkyMarshal
7a4b21382e Fixes for *custom v/h emotes
Blood type is now a variable of the DNA datum
Fixed runtime from blood
Fixed the AI prompt being missed.
Added breath holding.
2012-02-04 14:17:17 -07:00
cib
d121b740d1 Added Erthilo's bone gel and bone setter sprites. 2012-02-04 11:59:46 -08:00
Hawk-v3
3f45c881e2 Removing something for sky. 2012-02-03 17:59:49 +00:00
Hawk-v3
e4905ae1af Patching for a item file. Please, check this. Deny if it isn't needed. I tried to make it work. 2012-02-03 10:54:25 +00:00
quartz235@gmail.com
5f9fa90a90 TG Updates: Fixes: Issue 241 Issue 237 and Issue 240
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2708 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 08:55:24 +00:00
SkyMarshal
37ac7e31ee Hallucinations. 2012-02-02 21:53:08 -07:00
SkyMarshal
4290c35af8 Several detective fixes. 3 hour tape recorder. 2012-02-02 21:41:30 -07:00
SkyMarshal
a2237a10dc Fixes for singularity beacon glitching
further gibber fix.
Ghosts can no longer print autopsy reports
Shrunk evidence bags so they can be put in lockers.
2012-02-02 19:59:15 -07:00
SkyMarshal
0e15736ba9 Fixes for gibber and detective computer.
Fixed some hallucination and fingerprint stuff.
2012-02-02 19:30:12 -07:00
SkyMarshal
3087c5d2e6 Hallucinations are 50x creepier now, thanks Mr. Fox. 2012-02-02 01:13:49 -07:00
SkyMarshal
2ed57e0cc6 Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same.
Added hallucinations properly.
Added LSD (with hallucinations.)
Remapped slightly.
2012-02-02 00:35:48 -07:00
Albert Iordache
43d1d5aaab Merge branch 'master' of https://github.com/Hawk-v3/Baystation12 into Hawk-v3-master
Conflicts:
	code/modules/power/apc.dm
2012-02-02 08:50:33 +02:00
SkyMarshal
e7a7b8017d Fix for fingerprints. (They work right, now!)
Fixed the runtime related to brainmobs (sanity check)
do_after now works right.
Added the Decapitate objective, that is admin only ATM, which requires you remove their head and take it on the escape shuttle.
Fixes for a lot of surgery related bugs
Added a prompt to AI players when they are greeted, warning them not to stalk the traitor and so on.  Cacophony and Spaceman approved of it.
Sanity check for limb removal and blood stuff.
Added in sprites for a Syndicate statis/sleeper for a secret thing I have planned!
2012-01-31 21:23:37 -07:00
SkyMarshal
6e3aef823a Fix for wardrobes and lockers.
Fix for Fingerprints.
2012-01-31 17:58:22 -07:00
SkyMarshal
beffc2299a Final updates on Fingerprints
fix for traitors getting assassinate and protect targets for the same person
Ported blood rejection
2012-01-31 02:01:39 -07:00
SkyMarshal
6648061dcb MAJOR UPDATE: Detective/Fingerprints update
bugfix for wardrobes
blood type is now handled by datum/dna, and blood_DNA for atoms is a list of list, each sub list containing DNA and blood-type. (This allows multiple blood splatters)
added BS12 give command and explosives
Map update to remove blob spawn.
2012-01-31 02:01:38 -07:00
SkyMarshal
5dba3ccf88 WIP on detective work overhaul
Give command ported, with more sanity checks (It works, now!)
Added BS12 c4 in addition to TG c4
Fixed server air alarm
Book length increased 3 fold.
Blood and gibs now maintains DNA
Fixed evidence bags
Ported the awesome BS12 handcuff stuff, with flavor text.
2012-01-31 02:01:37 -07:00
SkyMarshal
d2eff85c17 Porting much of Aryn's stuff
-Sounds
-Detective Work
-Hallucinations
Tweaked server air alarm
Tweaked gibs
Working on de-derping surgery
Ported some BS12 stuff (stunned radio and adminwho)
Player's mind datum now holds their antagonist preferences.
2012-01-31 02:01:36 -07:00
quartz235@gmail.com
2f1b019396 TG Update: Fix for issue 246
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2705 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 18:03:57 +00:00
Albert Iordache
76c695c88b Merge pull request #330 from CIB/master
Autopsy fixes
2012-01-29 09:33:42 -08:00
SkyMarshal
4b79c258b6 Map update: Adds wardrobes for all jobs + copiers and filing cabinets.
Modified surgery to work with autopsy
Adminhelp should go to the admin channel without being stupid
suicide tweaked so all antags can use it
You can no longer radio while stunned
More door fixes.
2012-01-29 02:16:18 -07:00
SkyMarshal
820f3c1242 Merge pull request #324 from CIB/master
Stuff
2012-01-28 20:31:25 -08:00
SkyMarshal
21381780c4 Fixed bug with wardrobes. 2012-01-28 19:51:11 -07:00
cib
179d5a55ea A lot of fixes to autopsy.
- Projectiles now leave wounds that can be scanned through autopsy.
- The "fake" weapons selected by the scanner are no longer completely random.
- The scanner now displays age and severity of the wound.
2012-01-28 18:04:59 -08:00
SkyMarshal
42772d545e Suicides clonable, takes time to cut off limbs. 2012-01-28 16:58:20 -07:00
SkyMarshal
795d07fc6a Suicide bugfix, uplink bugfix, Made the electrical storm disrupt radio again, buugfix for the new door stuff, retoring UI+UE recovers identity. 2012-01-28 15:47:26 -07:00
cib
e14dfc5ace Added autopsy.
- When a human is attacked, data about the weapon is added to a special wound datum on the organ.
- This data can be extracted and processed by opening up the limb and using an autopsy scanner on it.
- Added the autopsy-scanner to the map.
2012-01-28 02:26:44 -08:00
SkyMarshal
3e9146f99a Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	maps/tgstation.2.0.8.dmm
2012-01-28 02:03:42 -07:00
SkyMarshal
695a673865 Final bugfixes, port of AutoTraitor (tested) and RP-Rev (Untested) 2012-01-28 01:52:14 -07:00
SkyMarshal
0e51764af4 Final load of bugfixes. Moved ported stuff to a subdirectory in Work in Progress, telecomms bugfix, fix for solar trackers, some human and monkey procs. 2012-01-27 22:55:16 -07:00
SkyMarshal
12afd61ffc Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant. 2012-01-27 20:15:06 -07:00
SkyMarshal
e8de0a1dca Bugfixes for some of the previous commit. Added new icons that are less derpy. 2012-01-26 23:18:57 -07:00
SkyMarshal
cd5e2476bd Added a new object, for storing premade outfits, that is in clothing closets.
Added clothing closets for several new jobs (Chef, Bartender, Virologist, etc.) and outfitted them.
Paper can now be burned, and acts as a hotspot and a light source when it is on fire.
Tweaked the Allinone broadcasters
Nerfed electrical storms
Response Team leader gets a special assignment/title.
Remapped to add Copiers, Filing Cabinets, and wardrobes
2012-01-26 22:19:33 -07:00
Albert Iordache
619afea38f Revert "water pipes base + pda support"
This reverts commit a591aef35c.
2012-01-27 10:06:12 +02:00
Albert Iordache
4d5ecd09b6 Revert "more water pipes stuff"
This reverts commit 2d639d053b.
2012-01-27 10:05:50 +02:00
Tastyfish
af14d9c9e9 seems \himself doesn't work right, contrary to docs 2012-01-26 22:36:13 -05:00
Tastyfish
07d989bbd7 Merge remote-tracking branch 'upstream/master' 2012-01-25 20:05:16 -05:00