Commit Graph

11595 Commits

Author SHA1 Message Date
Zuhayr
47dda54a72 Forgot SLOT_HEAD. 2014-01-04 12:53:51 +10:30
Zuhayr
f2300725f7 Made it possible to pick up and wear diona nymphs. 2014-01-04 12:49:55 +10:30
Zuhayr
122f5854d6 Fix for oversight of dionaea needing to breathe. 2014-01-04 12:49:15 +10:30
Zuhayr
62893f80b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-04 11:35:07 +10:30
Ccomp5950
5a356fabca Recursive Derp. This should fix that. 2014-01-03 17:05:58 -06:00
Ccomp5950
b654cfccda This doesn't look right either. 2014-01-03 13:42:42 -06:00
Ccomp5950
62df59ee68 Allow people inside/on objects to hear as well as cortical borers. 2014-01-03 12:55:40 -06:00
Ccomp5950
8ea79311c7 Compile fix after bad merge.
VERY BAD MERGE, no treats.
2014-01-03 11:03:39 -06:00
Zuhayr
db762394aa Merge pull request #4184 from Ccomp5950/fingerprints
Fingerprints on showers and crayon graffiti.
2014-01-03 05:46:38 -08:00
Mloc
08678a9e3e Merge pull request #4186 from Ccomp5950/kick_reason
Admins can now put a reason for booting someone from the server.
2014-01-03 03:42:59 -08:00
Mloc
d0736ff9cc Merge pull request #4185 from Ccomp5950/cyborg_hiddenprints
AI / Cyborgs will now leave hiddenprints.
2014-01-03 03:42:08 -08:00
Zuhayr
1a4e8fafe2 Merge pull request #4183 from Iamgoofball/cookie
Made cookies able to be baked in the microwave.
2014-01-03 03:27:57 -08:00
Ccomp5950
ea32e235ab Admins can now put a reason for booting someone from the server.
Virgie requested feature.
2014-01-03 01:09:06 -06:00
Ccomp5950
011c116373 AI / Cyborgs will now leave hiddenprints. 2014-01-03 00:28:54 -06:00
Ccomp5950
f0563911cb Fingerprints on showers and crayon graffiti.
fixes #4076
as well as admin request on crayons.
2014-01-02 20:26:14 -06:00
Chinsky
2737e20e7b Merge pull request #4174 from Zuhayr/master
Drone sprite replacement, diona evolution whitelisting.
2014-01-02 18:11:47 -08:00
Zuhayr
e642b3e7e7 Merge pull request #4175 from Mloc/runtimelog
Fixes runtime logging and makes it a config option.
2014-01-02 17:46:28 -08:00
Iamgoofball
a4536a3e90 Made cookies able to be baked in the microwave 2014-01-02 17:15:34 -08:00
DJSnapshot
2949c2f675 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-02 16:56:38 -08:00
Zuhayr
2c492d8289 Using DNA2 files from master. 2014-01-03 11:19:40 +10:30
Zuhayr
f679776a22 Made diona nymph evolution whitelisted. 2014-01-03 09:37:13 +10:30
Mloc-Argent
bd3a1718c4 Fixes runtime logging and makes it a config option.
Option starts off by default, since that could be seen as the original behavior...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-01-02 21:38:15 +00:00
Chinsky
69f9051d98 Merge pull request #4170 from Mloc/zas
Fix for the roundstart hook "runtime".
2014-01-02 13:17:32 -08:00
Zuhayr
4f025789b7 Merge pull request #4149 from Kilakk/dev
Made nuke ops able to choose their own names on spawn-in
2014-01-01 19:09:56 -08:00
Chinsky
5f9045eb06 Merge pull request #4169 from Kilakk/master
Fixed centcomm status reports listing vox raiders
2014-01-01 14:42:38 -08:00
LBraindead
9e752d7c79 Update Fire.dm
a bit of rebalancing that should fix the eternal-fire bug
2014-01-01 23:19:27 +01:00
Mloc-Argent
df5fd9555c Fix for the roundstart hook "runtime".
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-01-01 19:10:55 +00:00
Mloc
9e4a5b09a3 Merge pull request #4160 from Ccomp5950/albino_clone_fix
Albino clone fix
2014-01-01 11:02:55 -08:00
Ccomp5950
820bccc7d3 Merge pull request #4167 from Zuhayr/master
Abandoned crate nerf and minor ninja fix.
2014-01-01 10:59:58 -08:00
Kilakk
7a75242640 Where the hell did this even come from?
I should probably start checking for these things
2014-01-01 13:46:21 -05:00
Mloc
8e93ac2d96 Merge pull request #4164 from Ccomp5950/runtime_cleanbot
Cleanbot runtime derp.
2014-01-01 10:42:30 -08:00
Kilakk
3f4646ed58 Fixed centcomm status reports listing vox raiders
* It would say something like "Kikichata, the MODE"
* Which is hilarious, but still
2014-01-01 13:28:52 -05:00
Kilakk
4a10e9ce39 Merge remote-tracking branch 'upstream/dev' into dev
Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm
2014-01-01 11:51:53 -05:00
Zuhayr
37d96ebc80 Nerfs abandoned crates to be less fucking moronic. 2014-01-02 00:42:11 +10:30
Zuhayr
1cddbeb180 Fix for ninja being unable to wear full-sized oxytanks. 2014-01-01 22:10:25 +10:30
Zuhayr
f638f1db96 Prevented the ability to open locked crates with random items. 2014-01-01 21:33:23 +10:30
Zuhayr
b6af4a1b4e Removes mime and HONK carts from protolathe. 2014-01-01 21:26:19 +10:30
Ccomp5950
c6c09954aa Cleanbot runtime derp.
Set something to null then change a variable on it?  Sure that won't runtime.
2014-01-01 02:55:08 -06:00
DJSnapshot
5085ee2561 Emergency fix for mods not loading. 2014-01-01 00:02:17 -08:00
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Chinsky
2cf4a9279c Merge pull request #4157 from Ccomp5950/cleanbot_fix
Bugfix:  Actually implement cleanbot targeting.
2013-12-31 17:33:14 -08:00
Ccomp5950
3448b24dad Removed debug messages. 2013-12-31 18:06:39 -06:00
Ccomp5950
eb93d0a188 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into albino_clone_fix 2013-12-31 18:04:16 -06:00
Ccomp5950
36f81bd9b0 DNA2 clone fix. No longer albino with blue beards.
Looks like a copy paste problem where the eye blocks were being set to facial blocks
and the math needed for s_tone wasn't being done.

Todo:  Fix clones not having unique_enzymes, /list being displayed in cloning pod, etc.
2013-12-31 18:02:48 -06:00
Zuhayr
56c967c250 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-12-31 21:24:03 +10:30
Zuhayr
da654c80d0 Binary merge conflict, agh. Manual merge incoming. 2013-12-31 21:16:20 +10:30
Ccomp5950
645710cb0b Bugfix: Actually implement cleanbot targeting.
Cleanbots won't attempt to clean up the same mess.

Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds.

It was creating a blank list and then checking that list to see if anything else had
that mess targeted.  Removed the blank list check and added an actual check.
2013-12-30 21:59:20 -06:00
Zuhayr
9d4d14f107 Fix for low oxy tank at ninja spawn. 2013-12-31 11:37:21 +10:30
Zuhayr
441b015186 Fix for absurd dirt levels. 2013-12-31 11:34:35 +10:30
Zuhayr
25f7db1949 Fix for unremovable dirty tiles. 2013-12-31 11:32:36 +10:30