Cheridan
3fe48e2f26
Merge pull request #10248 from optimumtact/patch-6
...
log simple animal attacks to attack log
2015-06-29 23:03:12 -05:00
Cheridan
99b38caf9f
Merge pull request #10213 from MrStonedOne/runtimelogs
...
Adds optional runtime logging
2015-06-29 22:28:26 -05:00
Cheridan
604bcdef68
Merge pull request #10206 from Dorsisdwarf/smokeforyourhp
...
Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine.
2015-06-29 22:20:51 -05:00
Cheridan
1368794705
Merge pull request #10112 from Ikarrus/whyamiinspace
...
Reactive Teleport Armor can teleport the user to space tiles again
2015-06-29 22:11:03 -05:00
Cheridan
d36c01412f
Merge pull request #10238 from Incoming5643/catgirls2015
...
Catgirls 2015
2015-06-29 21:44:39 -05:00
Cheridan
87cd31c11f
Merge pull request #10211 from Ikarrus/burntweaks
...
Destructible Clothing Tweaks and Fixes
2015-06-29 21:38:20 -05:00
Cheridan
cb278febf6
Merge pull request #10237 from phil235/ShredsRuntimeFix
...
Fixes a runtime with shreds when it is burnt.
2015-06-29 21:21:42 -05:00
Cheridan
3b4dbc4f27
Merge pull request #10216 from nukeop/syndiesurgerybag
...
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
Dorsisdwarf
1f2e672f24
Remember kids: Smoking makes you RUGGED
2015-06-29 21:36:16 +01:00
Cheridan
8ad1c54d4e
Merge pull request #10221 from optimumtact/patch-5
...
Stop triggering myself when viewing fork code
2015-06-29 14:47:28 -05:00
phil235
7ce138afef
Merge pull request #9314 from AnturK/blob_examine
...
Adds blob toxin to blob description
2015-06-29 19:28:10 +02:00
Razharas
5b5c03dd6b
Merge pull request #10234 from Ikarrus/spraycanerror
...
Gang Tweaks + Fixes
2015-06-29 20:24:16 +03:00
Swag McYolosteinen
47b1deb528
Merge pull request #10204 from Razharas/VarEdit
...
Some varedit improvements
2015-06-29 19:18:28 +02:00
AnturK
0bfe2a191b
removes leftovers
2015-06-29 19:02:51 +02:00
phil235
34434d6012
Merge pull request #10210 from Perakp/cameraFix
...
Fixes aliens slashing cameras
2015-06-29 18:53:59 +02:00
phil235
588c12ee22
Merge pull request #10219 from xxalpha/mouthgag
...
Fixed not being able to eat with adjusted masks.
2015-06-29 18:23:56 +02:00
phil235
a8bc78e16e
Merge pull request #10125 from Iamgoofball/patch-85
...
Buffs the traitor toxins
2015-06-29 17:36:11 +02:00
phil235
a39effd14c
Merge pull request #10193 from Cheridan/what_a_fluke
...
Suit Sensor Fixes
2015-06-29 17:32:44 +02:00
Ikarrus
9b09a5115b
Increased recruitment cooldown to 3 minutes with bonus reductions at 30 seconds per head.
2015-06-29 08:46:11 -06:00
Razharas
eb4d6c66a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit
2015-06-29 13:42:23 +03:00
Jordie
f0d4dda9e1
Merge pull request #10218 from optimumtact/patch-3
...
Jetpack speed changes
2015-06-29 15:01:53 +10:00
Ikarrus
0ef4c29a89
Recruitment proc checks for the implant first before gang affiliation.
2015-06-28 22:01:01 -06:00
Orange Borg
77a77dd107
Jetpack speed changes [DNM]
...
being in zero grav now gives a -1 speedup (as if you had gottagofast)
being in zero grav with a jetpack gives -2 (gottagoreallyfast)
The gottagofast and gottagoreallyfast flags only apply in gravity situations now
2015-06-29 15:30:55 +12:00
Orange Borg
efcd5f3f75
log simple animal attacks to attack log
2015-06-29 15:24:34 +12:00
Ikarrus
4dbb5feb2d
If ex_act(2) is softened by armor, shredding chance gets halved
2015-06-28 20:29:13 -06:00
Ikarrus
a5c4d4134d
New Gene tag by Joan +fixes
2015-06-28 20:11:29 -06:00
Ikarrus
4f4b8f1774
Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/job_closets.dm
2015-06-28 19:00:16 -06:00
Ikarrus
48dedda36b
ABSTRACT items cannot be shredded
2015-06-28 18:55:34 -06:00
Incoming5643
2c9401fbc0
Whoops almost killed the miners with cats
2015-06-28 19:44:44 -04:00
Cheridan
5fc029d63d
Merge pull request #10215 from Ikarrus/freetheclothes
...
[Box, Meta, Mini] Moves clothes from out of equipment lockers and into wardrobe closets
2015-06-28 18:16:04 -05:00
xxalpha
0ab6b99658
Flag cleaning.
2015-06-29 00:08:49 +01:00
Cheridan
6c0a930cfb
Merge pull request #10173 from Incoming5643/coding_stupid_shit_is_my_antidrug
...
Rainbow slimes finally obtainable
2015-06-28 18:01:30 -05:00
xxalpha
47f3d802f6
Fixed not being able to eat with adjusted masks and helmets.
2015-06-28 23:51:55 +01:00
Incoming
bb8471ad3b
Adds a catgirls version of cursed items
...
Apologizes for nothing
:3
2015-06-28 15:27:01 -04:00
phil235
5f3bcf9eaf
Fixes a runtime with cleanable/shreds when it is burnt.
2015-06-28 21:09:54 +02:00
Ikarrus
d07e315ddf
Squashed
2015-06-28 12:11:05 -06:00
Ikarrus
5a7d43aedd
Error message for trying use the spray can with the cap on
2015-06-28 11:18:29 -06:00
Ikarrus
cbee684951
Macro/Micro bombs are now restricted to the Nuclear game mode.
...
Also fixes some broken spans.
2015-06-28 09:57:24 -06:00
Ikarrus
fbafd72660
Pistol Ammo was lost in the conflict resolution
2015-06-28 08:32:33 -06:00
Ikarrus
c08cfb8018
Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf
...
Conflicts:
code/game/gamemodes/gang/recaller.dm
2015-06-28 08:30:00 -06:00
Razharas
acca364c50
Merge pull request #10191 from Xhuis/thoseDogsAreSleepingByTheWay
...
Gang Fighting Styles
2015-06-28 17:22:38 +03:00
Razharas
601e7a6e09
Merge pull request #10095 from MrPerson/you_dare_bring_light_into_my_lair_you_must_die
...
Lighting SS speedup
2015-06-28 17:01:45 +03:00
Razharas
080156bba1
Merge pull request #10085 from phil235/AcidFix
...
Acids, Smoke, Foam, reagents reaction() refactors
2015-06-28 16:57:20 +03:00
phil235
c1a37bb2e0
Derp, I hate fixing merge conflicts...
2015-06-28 15:27:58 +02:00
AnturK
ef9712be12
Polling instead of persistent.
2015-06-28 15:23:43 +02:00
phil235
e8d3deafab
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
Razharas
6c488b289a
Merge pull request #9885 from kingofkosmos/latheexofabspittingstuff
...
Autolathe produces items on top of itself
2015-06-28 16:16:31 +03:00
AnturK
cad9b44264
Removes redundancy
2015-06-28 14:34:48 +02:00
AnturK
20576bb71f
Adds blob toxin to examine
2015-06-28 14:34:48 +02:00
Razharas
98c2bd18db
Merge pull request #9620 from xxalpha/mineralcontainer
...
Fixed banana shoes mineral handling.
2015-06-28 15:07:17 +03:00
