Zuhayr
ee6a69e35d
Fixes #3248
2013-11-23 00:57:40 +10:30
Zuhayr
8400c73cc1
Nuke merge.
2013-11-23 00:44:19 +10:30
Zuhayr
507d4feb66
Reverting a half-fix that was put into master instead.
2013-11-23 00:41:25 +10:30
Zuhayr
bf44db3393
Due to total absence of ninja spawn points, using carpspawn directly.
2013-11-23 00:39:43 +10:30
Zuhayr
c8c8e9d078
Removing species restriction on ninja gear.
2013-11-23 00:39:00 +10:30
Zuhayr
f26f64efad
Fixes #3643
2013-11-22 23:47:23 +10:30
Zuhayr
ddabdf90f2
Fixes #3842
2013-11-22 23:17:57 +10:30
Zuhayr
f11b964f6c
Fixes #3921
2013-11-22 23:10:06 +10:30
Zuhayr
b2ca9f9ccb
Added icon_override var to obj/item. When worn, items with icon_override set will use this DMI instead of the hardcoded clothing DMI to determine on-mob sprite.
2013-11-22 22:51:55 +10:30
Zuhayr
ae0605db42
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-22 22:18:44 +10:30
Zuhayr
c5b6d42ed5
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-22 22:18:32 +10:30
Mloc
4f7f371155
Merge pull request #3950 from comma/dirt
...
Dirt
2013-11-22 03:45:44 -08:00
Zuhayr
caee3a81e2
Adds sprites and skeleton definitions for species-specific Syndicate hardsuits.
2013-11-22 09:52:04 +10:30
Jim "Apples"
f1ce28b7fe
Merge pull request #3951 from Ccomp5950/custom_item_creation
...
Custom Item Request
2013-11-21 07:23:39 -08:00
Ccomp5950
69dbec4920
Custom Item Request
...
Confirmed with Apple that this was acceptable.
2013-11-21 09:08:30 -06:00
Chinsky
65a9bf6e4b
Merge pull request #3930 from Higgin/dev
...
Changes to how projectiles work: take two!
2013-11-21 02:23:46 -08:00
Chinsky
c50c401a85
Walking on tile makes it dirty. Takes 40 times for mob to enter tile for dirt overlay to appear.
...
Mopping resets dirtiness level.
2013-11-21 13:46:16 +04:00
Chinsky
48150acc5a
Removed earrape
2013-11-21 12:21:50 +04:00
Iamgoofball
43bde0598d
Uncommented the dressing up corgi code! Have fun replacing the condom! Also adds a player requested item.
...
http://baystation12.net/forums/viewtopic.php?f=33&t=9120 Rainbow Belt
2013-11-20 18:10:14 -08:00
Higgin
d72d845cba
Fix to fix a fix that needs fixing.
2013-11-20 16:00:07 -08:00
Ccomp5950
7d545437a3
Spelling mistake.
...
Commit_Count++
2013-11-20 17:49:11 -06:00
Iamgoofball
ac4e42bb2a
After a very prolonged set of Syndicate budget cuts, Detomatix PDA carts are no longer buildable
2013-11-20 15:29:33 -08:00
Ccomp5950
d1ca50f384
Bugfix: Yeah variables are case sensitive.
...
Lesson learned: Always compile before commit, unless attempting to pad your commit count.
2013-11-20 17:24:39 -06:00
Iamgoofball
7dcb47ec2a
R.I.P H.O.N.KBlaster 9000. You died as you lived. Hidden in a crate.
2013-11-20 15:19:24 -08:00
Ccomp5950
34fb26a649
Ravensdale request:
...
Detomax cartridge use will not create an admin message saying the name/key of the antag that tried to blow up the target, and if it was successful or not.
2013-11-20 17:11:21 -06:00
Iamgoofball
b024087119
Merge branch 'smallchanges' of https://github.com/Iamgoofball/Baystation12 into smallchanges
...
Conflicts:
code/modules/research/designs.dm
2013-11-20 15:00:36 -08:00
Iamgoofball
e36f0c3fac
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into smallchanges
...
Conflicts:
code/modules/research/designs.dm
2013-11-20 14:59:33 -08:00
Iamgoofball
7fa80e799a
made head PDA carts be in lockboxes. Added Abandoned Crates!
2013-11-20 14:57:22 -08:00
Iamgoofball
ab43cc9cd6
made head PDA carts be in lockboxes. Added Abandoned Crates!
2013-11-20 14:56:49 -08:00
ZekeSulastin
2a95cdd296
Scalpels also mangle gloves for nonhuman wear.
2013-11-20 17:07:05 -05:00
Chinsky
60f644c401
Merge pull request #3941 from Iamgoofball/telesci
...
Changes Telescience to Projectile Trajectory!
2013-11-20 10:32:41 -08:00
Chinsky
4beabc587d
Merge pull request #3940 from Ccomp5950/ghost_buff
...
AntagHUD's player verbs will now disappear from the players view if disabled by admin or by configuration options.
2013-11-20 10:32:18 -08:00
Chinsky
48c35d0f8f
Merge pull request #3938 from Ccomp5950/master
...
Admin request: Jobbans for IA and ERT
2013-11-20 10:27:36 -08:00
Zuhayr
222a544d5d
Raider state display compile fix.
2013-11-20 18:47:37 +10:30
Zuhayr
71416e543e
Changed diona evolution to use nutrition rather than nutriment.
2013-11-20 18:33:39 +10:30
Zuhayr
249cd0d069
Increased REQUIRE_LIGHT min level to 5, removed burn damage from healing from RAD_ABSORB.
2013-11-20 18:32:00 +10:30
Zuhayr
32b2009c25
Diona will take five times as much damage from plant-B-gone as previously.
2013-11-20 18:26:55 +10:30
Zuhayr
542104478f
Commented out the Sec-healing component of sprinkles.
2013-11-20 18:18:55 +10:30
Zuhayr
9015b815b3
Uncommented the original Heist objective code, removed one-of-each testing code.
2013-11-20 18:18:38 +10:30
Zuhayr
d1e6094a77
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-20 17:50:01 +10:30
Iamgoofball
2be70afe8b
changed it so that only syndi-hardsuits only restrict vox
2013-11-19 23:12:41 -08:00
Iamgoofball
06719b5aa9
added a fuck ton of small changes
2013-11-19 23:00:07 -08:00
Iamgoofball
c13f57613c
Changes Telescience to Projectile Trajectory!
2013-11-19 19:23:51 -08:00
Ccomp5950
46218e71f1
Bugfix: AntagHUD, need to remove verbs from correct object
2013-11-19 05:59:28 -06:00
Ccomp5950
7be20c0986
AntagHUD's player verbs will now disappear from the players view if disabled by admin or by configuration options.
...
Poor guys won't know what they are missing!
Admins/Mods will still have the verb viewable.
2013-11-19 05:36:40 -06:00
Ccomp5950
513953b927
Cleanup: Removed unneeded variables and a debug variable.
2013-11-19 01:10:59 -06:00
Ccomp5950
457835db38
Admin request: Jobbans for IA and ERT
2013-11-17 18:16:42 -06:00
DJSnapshot
9936a9251f
Helps to add the actual new file.
2013-11-17 11:55:57 -08:00
DJSnapshot
b75380985e
Using a better method to handle autotransfers. Old method was silly.
2013-11-17 11:54:43 -08:00
Ccomp5950
340532dc55
String fix on adminverb
...
Added holder checks so admins can use antagHUD regardless of restrictions.
2013-11-17 13:16:55 -06:00
