Commit Graph

151 Commits

Author SHA1 Message Date
SkyMarshal
e8bd665e76 Added overdoses to some chemicals. Fixed some gamemode stuff, involving uplinks. 2012-02-29 17:17:41 -07:00
Mloc
9cee329958 Merge pull request #563 from SkyMarshal/master
Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.
2012-02-29 12:51:48 -08:00
SkyMarshal
4524a2ff10 Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space. 2012-02-29 13:48:16 -07:00
CIB
6cacfacf57 Merge pull request #549 from Hawk-v3/master
TG UPDATES
2012-02-28 18:26:18 -08:00
Tastyfish
373dc5937d Merge pull request #551 from SkyMarshal/master
TG updates, improved nuke.
2012-02-28 17:36:12 -08:00
SkyMarshal
66f38fb34b TG UPDATE: Updates to telecomms, bug&runtime fixes, manifest for all, improved nuclear bomb.
All PDA's can access the manifest.
Nuclear bomb now works on realtime.
Telecomms not mapped yet.
Numerous Runtime Fixes
2012-02-28 18:24:43 -07:00
quartz235@gmail.com
86ae15aa49 TG Update: tiny bugfix before i go to sleep fixes issue 180
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2735 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-28 20:52:52 +00:00
Hawk-v3
5a7104e16a Iconchanges for upcoming patch, changes to keep the icons in line with what exists. 2012-02-28 20:34:46 +00:00
CIB
27fd036c87 Merge pull request #539 from SkyMarshal/master
Fixed lasers, balanced nuke, removed stupid code, removed Karma, improved admin panel.
2012-02-28 00:44:06 -08:00
SkyMarshal
b653c615be Replaced a lot of stupid from the wardrobes and package wrap, they now use an afterattack call instead of specific code for them in EVERY OTHER ITEM.
Improved the admin panel.
Removed Karma.
2012-02-28 00:11:15 -07:00
Tastyfish
dff472ad66 removed stupid shoving things into food thing 2012-02-27 23:25:57 -05:00
Tastyfish
4452344e2e food fixes / improvements 2012-02-27 21:18:20 -05:00
SkyMarshal
c7af63b281 Energy projectiles now move instantly, leaving a straight line from their origin to their destination, like real energy weapons.
Welderbackpack now has a proper icon.
Stun rounds can now be reduced or blocked by armor
Added more update_clothing() calls
Fixed strangling non-humans.
Blob is now an announcement only.
2012-02-26 23:06:43 -07:00
Miniature
2fdc1c5ca7 Merge pull request #502 from Miniature/master
Fixed selecting a bottle sprite breaking bottles FOREVER
2012-02-24 06:19:08 -08:00
Miniature
a627288f5d Fixed selecting a bottle sprite breaking bottles FOREVER 2012-02-25 00:48:12 +10:30
SkyMarshal
f7d17d24bf Merge pull request #498 from Miniature/master
Added a cap to chem dispenser charge
2012-02-23 08:18:17 -08:00
Miniature
99076f2738 Added a cap to chem dispenser charge 2012-02-24 02:13:26 +10:30
SkyMarshal
7631f9c32c Fixed #460, #456, and #478
Cleanbot autopatrols now
Ghosts can see PDA messages, a PDA will show you the fingerprints if it is complete enough (Security scanner)
Display case can be repaired.
More update_clothing() calls
Disabilities have their own window, now.
Removed the genetics scanner, go use yer penlights!
2012-02-21 18:58:28 -07:00
cib
7fd3c5a4c4 Changes to vira and health scanner.
- Antibodies now immunize you once they fight off a disease.
- The pathogenic isolator now displays whether blood is infected.
- Antibodies now work on monkeys.
- Syringes now extract reagents other than blood from humans, too.
- Separated the health scanning proc from the health scanner, so that it can later be re-used in the PDA.
- Health-scanners now display hints of whether someone may be infected.
2012-02-19 17:28:54 +02:00
SkyMarshal
a36982a677 DNA and chooseable disabilities! Yaaay! 2012-02-17 19:38:30 -07:00
Miniature
c612f91430 I am an idiot, fixing chemmaster runtime 2012-02-17 19:13:39 +10:30
Albert Iordache
0d19e9c7b3 Merge pull request #434 from Miniature/master
Added a thing to select pill and bottle sprites to the chemmaster
2012-02-16 08:21:13 -08:00
Miniature
9efde25a60 Added a thing to select pill and bottle sprites to the chemmaster
At some point I'd like to see bottles doing the same thing as beakers, where they show what chemicals are in them on the sprite. That however would involve messing with sprites and overlays and stuff, so I can't be bothered to actually do it at the moment. Just remember that this stuff will need to be changed for that.
2012-02-17 01:15:36 +10:30
SkyMarshal
8769fdd3fc Merge pull request #432 from Tastyfish/master
ported in a bunch of the old food making stuff
2012-02-15 19:11:30 -08:00
Tastyfish
c74c9b48e9 fix capsicum and frost oil to make sense 2012-02-15 14:46:35 -05:00
SkyMarshal
b5c1d99471 Added some more feedbacks on the blood_DNA stuff
Fixed up some chemistry stuff
Nitrogen now adds atmospheric nitrogen when splashed on the ground.
2012-02-14 21:34:52 -07:00
Tastyfish
badb7bd93f Merge remote-tracking branch 'upstream/master' 2012-02-14 12:01:14 -05:00
Tastyfish
12d119c109 porting old food stuff 2012-02-14 11:59:16 -05:00
SkyMarshal
3fbcbfe448 Merge pull request #416 from SkyMarshal/master
Bugfixes for Borg&Doors
2012-02-13 15:58:17 -08:00
SkyMarshal
42be0feff6 Bugfix for borgs&doors as well as chem grenades. 2012-02-13 16:56:34 -07:00
Miniature
006e91f4c1 Made dexalin and cloneoxadone use a slight amount of plasma, in addition to requiring it as a catalyst.
No, it doesn't make sense for oxygen being in the presence of plasma to transmute into dexalin.
2012-02-13 23:15:23 +10:30
SkyMarshal
1d29574bc3 Part 2 of the WIP chemistry stuff
Map update with secure doors!
2012-02-09 21:50:50 -07:00
SkyMarshal
90d47bccf9 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-09 16:29:31 -07:00
SkyMarshal
48453a3592 WIP work in making welding fuel not retarded
Chem grenades are now awesome again.
2012-02-09 16:29:06 -07:00
Tastyfish
2dc3a5cc6e fixed horribly buggy camera assembly 2012-02-08 20:56:04 -05: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
SkyMarshal
0e15736ba9 Fixes for gibber and detective computer.
Fixed some hallucination and fingerprint stuff.
2012-02-02 19:30:12 -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
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
Hawk-v3
d10b9789a2 A change for next patch. 2012-01-30 18:39:57 +00:00
Albert Iordache
619afea38f Revert "water pipes base + pda support"
This reverts commit a591aef35c.
2012-01-27 10:06:12 +02:00
Tastyfish
07d989bbd7 Merge remote-tracking branch 'upstream/master' 2012-01-25 20:05:16 -05:00
Hawk-v3
27beb7f3fd ERT edits.
Changed the chemical amounts and added some info to each team's section, plus cloner and Cure Machine to Shuttle.
2012-01-25 23:17:04 +00:00
SkyMarshal
d61626440c Response Team Update:
-Response team now have a pimp'n base, containing gear for the leader as well as Medical, Engineering, and Security special loadouts.
-TG updates for comms and mulebot
-Special medical tools for response team
-Increased time between events slightly.
-Map updated with nerfed comm satellite, and added Death Alarms in medbay in addition to the new Response Team area.
2012-01-25 11:51:55 -07:00
Tastyfish
40dbc8a659 Merge remote-tracking branch 'upstream/master' 2012-01-24 15:47:07 -05:00
Tastyfish
a591aef35c water pipes base + pda support 2012-01-24 15:45:51 -05:00
cib
e2e1cecd7d Changes to medbots.
- They now have a mode, which is enabled by default, in which they only inject chemicals if the chemical helps with the target's damage.
- You can now load and unload them without access.
- Added a few beakers of tricordrazine to robotics, so they can load medbots when they make them.
2012-01-22 19:22:07 -08:00