Commit Graph

499 Commits

Author SHA1 Message Date
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
Albert Iordache
888730e196 Fixed a runtime error with the filling cabinet 2012-01-31 10:14:15 +02:00
CaelAislinn
a711259856 added pressure sealed hatches for testing / WIP purposes
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-30 22:23:01 +10:00
SkyMarshal
1e03fb9d72 bugfixes 2012-01-28 15:55:00 -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
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
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
21fe68972f Lots of stuff, will elaborate later. 2012-01-27 11:18:14 -07:00
SkyMarshal
351ed2a250 Deeeerp. Bugfix. 2012-01-26 23:21:02 -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
Tastyfish
a0e9986b50 fixed livestock attack flavor again, derp 2012-01-26 22:25:30 -05:00
Tastyfish
40dbc8a659 Merge remote-tracking branch 'upstream/master' 2012-01-24 15:47:07 -05:00
Tastyfish
d6de48663e livestock spelling/grammer fixes 2012-01-24 15:41:54 -05:00
cib
f9cbc78790 Map error fix, and diseasedisk icon fix. 2012-01-22 22:14:55 -08:00
SkyMarshal
f509cda7b0 Merge pull request #284 from Tastyfish/master
added orderable chickens and cows
2012-01-16 23:17:36 -08:00
SkyMarshal
0d7ce5f347 Port of the TG radio system. Tasty and I tested it out and it works smooth and clean :)
We were able to restore functionality after we blew up half the radio equipment, as well.
AI satellite is now the Comms satellite.
2012-01-17 00:12:30 -07:00
Tastyfish
53baf4755f Merge remote-tracking branch 'upstream/master' 2012-01-16 20:27:36 -05:00
Tastyfish
df208f7189 added orderable chickens and cows 2012-01-16 20:26:17 -05:00
Tastyfish
1dbc4997fb put filing cabinet in correct path in tg standards 2012-01-14 00:54:58 -05:00
Albert Iordache
e3c4b0f88f Merge pull request #276 from SkyMarshal/master
Weldpack added, not on map; Clipboards fit on belt; Wrapping is more robust.
2012-01-12 11:43:39 -08:00
SkyMarshal
70cb3417ef Added weldpack, clipboards fit on belt, food and other things can now be wrapped 2012-01-12 11:13:05 -07:00
Tastyfish
9e5925b1f9 fixed custom items loaded and custom_items.txt 2012-01-12 01:54:27 -05:00
Tastyfish
b5c8b89a4d Merge remote-tracking branch 'upstream/master'
Conflicts:
	code/WorkInProgress/Mini/customitems.dm
2012-01-12 01:48:33 -05:00
Tastyfish
e5abd35dae made custom items read from a config file 2012-01-12 01:47:55 -05:00
SkyMarshal
80761ed2e5 Added pink labcoat. 2012-01-11 22:21:26 -07:00
SkyMarshal
ba24236380 Ported filing cabinet and photo copier. 2012-01-10 21:49:58 -07:00
cib
a36aebb512 A few medical-related fixes.
- Fixed another problem related to the crit config
- Recovering from shock won't take forever anymore
- Reduced the max speed at which you suffocate, mainly to make crit slower. If this is found to affect normal suffocation too much, increase HUMAN_MAX_OXYLOSS again.
- Open organs now add a lot of shock, as well.
- Hitting 0 health or below will make you collapse immediately.
2012-01-09 06:30:16 -08:00
Tastyfish
1d010aca75 Merge remote-tracking branch 'upstream/master' 2012-01-08 20:06:03 -05:00
Albert Iordache
9d2e285190 Fixed a bug with obj/item/clothing/under/chameleon/psyche , added some small details to Antiqua and redid the arrivals arm, and removed the patient ward area. (can still be recovered via TortoiseGit, by reverting to an earlier version; I'll explain in the Antiqua topic why I removed it) 2012-01-08 19:19:53 +02:00
SkyMarshal
cdbb00d264 Fixes a problem with aliums and police tape. 2012-01-06 16:55:56 -07:00
Tastyfish
c4f5429857 furthur work on bones 2012-01-06 16:41:47 -05:00
SkyMarshal
74b68e2315 Bugfix. 2012-01-06 14:01:53 -07:00
cib
72fd16a41c Fixed an issue with the cure research machine and a few other virus related glitches. 2012-01-05 17:39:33 -08:00
Albert Iordache
1053acea64 Merge pull request #219 from caelaislinn/master
new conveyors, diverters, partially fixed ultralight, new helper proc
2012-01-05 04:37:16 -08:00
CaelAislinn
a6c6c44112 ported z-levels from old bs12. ready for implementation into map/s
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-05 22:03:43 +10:00
Tastyfish
a2ff049861 merge 2012-01-04 23:01:22 -05:00
cib
66f6d325a4 Increased infection chance significantly in the hopes that this will somehow help vira not spreading. 2012-01-04 22:07:26 -08:00
cib
757bdc08f2 You can now produce infected blood from a virus dish with the cure research machine. 2012-01-04 19:16:35 -08:00
Tastyfish
14e9dbd779 a couple chatbot grammer improvements 2012-01-04 17:25:33 -05:00
Miniature
5a5c620692 Now atmos alarms automatically let atmos techs change them if they go off, as well as people can turn that off or make them permamently controllable by the computer
also made it possible for them to mess with any alarm that hasn't had the atmos control completely disabled, but not a way to turn that feature on
2012-01-04 22:52:01 +10:30
SkyMarshal
9a651a5a84 Added psyche jumpsuit for Asanadas
Expanded scrambled radio stuff.
2012-01-03 00:06:25 -07:00
SkyMarshal
72c6369368 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-02 21:49:09 -07:00
SkyMarshal
411ccc4075 Shitload of stuff. 2012-01-02 21:48:42 -07:00
Tastyfish
7abc22bf78 make pailiza tell parser less confusing 2012-01-02 18:52:38 -05:00
Tastyfish
87a14c0674 machine ingredient adding more intuitive 2012-01-02 11:46:19 -05:00
cib
40fb4bb628 Mucus and a few fixes to vira.
Added mucus that is added to the map sometimes when sneezing or coughing. Blood now carries the spiller's virus2. Fixed a problem with virus spreading.
2012-01-01 20:50:46 -08:00
Miniature
205ad71ee6 Made atmos control show name of alarm, coloured active alarms in list, added to map 2012-01-02 03:18:06 +10:30
Miniature
10401563e2 Atmos control computer
Lets you use atmos alarms from atmospherics, if people press a button on the alarm
Not added to map
2012-01-02 00:21:24 +10:30