Commit Graph

9456 Commits

Author SHA1 Message Date
Yeti
b3c9484398 Added Superboredguy's item: Engineering Hat 2013-04-13 14:32:11 -04:00
Jupotter
614c01f238 Fix a wrong null check in posibrain
A wrong nullcheck that prevent posibrain searching for a player
2013-04-13 13:16:28 +03:00
Chinsky
3a0e432832 Merge pull request #2653 from Jupotter/master
Fix for posibrain not turning off
2013-04-13 02:20:16 -07:00
Jupotter
a8e1081d9d Add check forposibrain without brainmob
This should never happen, but check nonetheless.
2013-04-13 11:58:58 +03:00
Chinsky
73c17ceb80 Merge pull request #2652 from SkyMarshal/master
Fire fixes and improvements.  Note: May need fine tuning.
2013-04-13 01:03:31 -07:00
Yeti
4928a3aa59 Custom item: Old Camera 2013-04-12 22:40:24 -04:00
Ravensdale
9e33c868cf comments out suethecake's gun due to having a weapon's ban 2013-04-12 10:41:19 -07:00
jupotter
4836e9b057 Fix posibrain not turning off if no candidate
The reset proc was checking for the presence of a brainmob, while one
was created in the constructor. It should rather check the presence of a
key
2013-04-12 19:16:08 +02:00
SkyMarshal
c63dc0f962 Compile fix. 2013-04-11 12:19:35 -07:00
SkyMarshal
221901ba3a fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-11 12:14:47 -07:00
SkyMarshal
9176901c11 Napalm can now be made, due to fire changes. 2013-04-11 11:50:29 -07:00
SkyMarshal
b1e9955ea7 Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf. 2013-04-11 11:21:46 -07:00
Asanadas
778211d482 Mixing napalm is incredibly broken with ZAS / not found on our wiki because it's a "secret recipe" so I figure let's just comment it out. 2013-04-09 18:34:14 -04:00
fauxtada
efd65fe495 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-04-09 00:51:17 -07:00
SkyMarshal
7d114d22bd Fixes issues:
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
2013-04-09 00:49:19 -07:00
jupotter
12c7cfc88a Allow sec hud to add comment to sec record
Add a direct [Add comment] link in the examine text
Add a comment in the record comment list, signed with the current
authentication of the HUD wearer

Add a [View comments log] link in the security record view from the
Security Hud
This list all the comments as on the security record computer
2013-04-08 14:13:58 +02:00
jupotter
4b9d14b564 Allow medical hud to add comment to medical record
Add a direct [Add comment] link in the examine text
Add a comment in the record comment list, signed with the current
authentication of the HUD wearer

Add a [View comments log] link in the medical record view from the
Medical Hud
This list all the comments as on the medical record computer
2013-04-08 14:12:57 +02:00
jupotter
bd52b3de32 Fix medical status change text from medical hud 2013-04-08 14:07:13 +02:00
adammartinez271828
3b95bf2279 Updates to sun.dm and solar.dm
Improved solar manual tracking by switching sun.dm and solar.dm to run off of the same clock (world.time) and added several options to the solar generator control computer.
2013-04-07 10:17:41 -04:00
Cael_Aislinn
664ea3efa7 added two-way smart cycling airlocks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-04-05 16:12:31 +10:00
SkyMarshal
ef54f5566e Fire apparently was ignoring fire/temperature resistant things, I was informed of a possible fix (commenting out the call to the FireBurn proc when you are in a tile with fire, thanks Nernums) and should hopefully resolve the issue. 2013-04-04 17:18:35 -07:00
Chinsky
c6a1fd75fa Merge pull request #2621 from SkyMarshal/bugfixes
Reverts Cael's retard flailing.  Do not fuck with zone sharing ratios...  Also: Fixed fire.
2013-04-04 01:59:13 -07:00
SkyMarshal
06da479c97 Makes liquid fuel cleanable again. Got removed in last commit since all that was done was revert Cael's changes. 2013-04-04 01:50:59 -07:00
SkyMarshal
9b0c40756b Fixed fire. 2013-04-04 01:29:23 -07:00
SkyMarshal
c97750f913 Reverts Cael's retard flailing. Do not fuck with zone sharing ratios unless you know what you are doing, as air movement then becomes quite chaotic and derpy. Should fix some issues with ZAS. 2013-04-04 00:30:15 -07:00
Asanadas
f3e1ff57d6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-04-04 01:15:03 -04:00
Spamcat
e1604d08d8 No more ninja munching. 2013-04-03 20:54:00 +04:00
Spamcat
93e37a6a0c Fix for mouse emotes, courtesy of nan0desu.
#2613
2013-04-02 23:25:34 +04:00
Cael_Aislinn
2e0370ba65 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-04-02 21:14:13 +10:00
Cael_Aislinn
616f65eb68 changed bees to simple_animals (cleaning up a bunch of movement issues), made bees non-pullable, made apiary trays properly revert to the type of tray they were before the apiary was added
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-04-02 21:13:16 +10:00
Cael_Aislinn
964525450d only hoverpods should make hissing noises when they move now
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-04-02 20:16:47 +10:00
Spamcat
4bcb2a1471 NRA Utopia.
Comitting for Rowtree.
2013-04-01 17:43:30 +04:00
Spamcat
866a1c5feb Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-31 21:03:43 +04:00
Spamcat
40067b3d95 Fixed #2598
also fixed a derp in CE's office
2013-03-31 16:54:53 +04:00
Spamcat
020a555f0f Fixed #2596.
also fixed #2599 in my map commit
adding these so issues would automagically close when merged because no-one closes them ever
2013-03-31 15:19:09 +04:00
Spamcat
dc2c87bc46 Fixed #2607
and #2600 - in previous commit
2013-03-31 14:26:44 +04:00
Cael_Aislinn
14bbdc91ca cleaned up artifact/find debris spawning, stopped debris being dropped for every asteroid turf, dropped machinery heat gain by 3/4
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-31 01:29:19 +10:00
Chinsky
fabb43d38a Merge pull request #2595 from Spamcat/BEF-staging
BEF staging
2013-03-29 06:18:51 -07:00
Spamcat
e424850568 Revert "Removed unneeded checks."
This reverts commit 53b0a3f8c3.
*slaps himself* Don't touch what's working, chucklefuck.
2013-03-29 14:51:57 +04:00
Spamcat
53b0a3f8c3 Removed unneeded checks.
config.usealienwhitelist check is already in the function
2013-03-29 14:33:32 +04:00
Spamcat
6f1b9a44ab Virology is working again. 2013-03-28 18:23:30 +04:00
Asanadas
f3d605abe3 De-Culting and you! Null Rods re-receive the ability to de-cult cultists, and a tiny desc change. Holy Water also has the chance to de-cult on metabolism, but less of a chance than the null rod. Holy Water may need some balance adjustments, will watch it in the future.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2013-03-27 19:45:40 -04:00
Spamcat
288f0926fe Made monkeys infectable, 2013-03-27 22:36:24 +04:00
Spamcat
7bd9bf57c0 Nerfed syringestab.
Again.
2013-03-26 13:26:59 +04:00
Spamcat
71031c2470 Chemmaster puts pills in pill bottles. 2013-03-26 13:24:35 +04:00
Spamcat
4ad2ce87a6 bleh, removed stray debug thingy 2013-03-24 14:40:15 +04:00
Spamcat
285a1dd89e Arrivals announcement computer strikes back!
phew, took me long to get rid of it
2013-03-24 02:20:57 +04:00
Spamcat
fcac941bc1 Fixed lizards being unable to spawn mid-round.
more dirty fixes, yay
2013-03-23 03:02:45 +04:00
Christian Bielert
599e410d53 Merge pull request #2579 from Uristqwerty/tube-update
Update from early tubes with bugs...
2013-03-21 09:05:58 -07:00
Spamcat
5fefbb3e29 The the commit message. 2013-03-21 18:11:26 +04:00