d31f5ed876
Merge pull request #17280 from TechnoAlchemisto/I_can't_escape_my_cycles_of_guilt
...
Security Fashion Refactor
2016-05-01 19:33:22 -04:00
56a2a606c6
helmet standard issue
2016-05-01 13:36:11 -07:00
a72e48ffe3
the fact this never came up is surprising
2016-05-01 12:20:06 -04:00
72f25a53e6
Merge pull request #17277 from KorPhaeron/cyborg_buffs2
...
Cyborg Blueprints
2016-05-01 11:05:48 -04:00
1be07b13ef
Paperplane balance fix ( #17278 )
...
Drastically reduced eye damage proc chances
2016-05-01 12:22:11 +02:00
2881b4a09e
Merge pull request #17144 from Cheridan/scavengers
...
Adds scavengers for ash walkers.
2016-05-01 19:45:49 +10:00
76d5557d90
Merge pull request #17227 from coiax/i-can-participate-too
...
Removed objectionable absinthe name, procedurally generates absinthe name instead
2016-05-01 19:41:53 +10:00
14a14ccb97
Code review
2016-05-01 10:28:07 +01:00
70d1ecfb68
Fixing conflicts
2016-05-01 04:11:21 -05:00
3981f27e3d
Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers
...
Conflicts:
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
icons/mob/animal.dmi
icons/mob/mob.dmi
2016-05-01 04:06:26 -05:00
0a45f89bdc
Finishes scavengers
2016-05-01 03:51:25 -05:00
d0dcd62e87
Merge pull request #17268 from Core0verload/grubgrub
...
Goldgrub no longer can burrow into the station floor
2016-05-01 17:50:09 +10:00
c5812d625e
Merge pull request #17263 from lzimann/hogstuff
...
Some Hand of God fixes
2016-05-01 17:45:56 +10:00
370cb1b1da
Merge pull request #17273 from Core0verload/mechboard_naming
...
Removes "Exosuit Module" from mecha board design names
2016-05-01 17:38:12 +10:00
9df519629f
Merge pull request #17260 from Core0verload/fuckoldpotency
...
Fixes MK-HONK shoes spawning useless banana peels
2016-05-01 17:34:09 +10:00
3d781f1498
Implements freezie floors and buffs frostoil ( #17081 )
...
* Implements freezie floors and buffs frostoil
🆑 nullbear
rscadd: A reminder for crew to avoid mopping floors in cold rooms, as
the water will freeze and provide a dangerous slipping hazard known as
'ice'. Running on it is not recommended.
rscadd: frostoil is deemed an effective chemical for cooling down areas
in the event of a plasma fire.
:/cl:
Makes wet floors freeze in cold environments, and evaporate in warm
environments.
Makes frostoil cool the atmosphere, and make the floor wet. Typically
resulting in icy floors.
Fixes gluon grenade potentially making floors permanently icy.
* tweaks to gluon bomb as per bawhoppens request
* Update syndieminibomb.dm
* Update open.dm
* Update open.dm
* Update syndieminibomb.dm
2016-05-01 17:26:46 +10:00
265938e7d9
Merge pull request #17220 from Incoming5643/badmins_doing_shit
...
View vars will now tell you if something has been previously var edited
2016-05-01 17:02:02 +10:00
98655ac6e8
Merge pull request #17219 from TrustyGun/lavaland_cuisine
...
Adds Stuffed Legion
2016-05-01 16:59:11 +10:00
f3f0c63e4f
Merge pull request #17245 from nullbear/c4-path
...
Changes C4 Path and adds X4 breaching charge
2016-05-01 16:41:07 +10:00
526236a558
inheritance
2016-04-30 13:42:08 -07:00
43ada53037
Merge pull request #17272 from KorPhaeron/dragon
...
Fixes Dragon Explosion Log Spam
2016-04-30 15:04:54 -04:00
f79a2a07d7
Fixes bug where it didn't work
2016-04-30 16:09:21 +01:00
55514c3be6
Merge pull request #17233 from coiax/mining-item-stats
...
Added more stat tracking to mining items and engine generation
2016-04-30 08:21:41 -05:00
91fd7d4212
Merge pull request #17210 from Zuvassin/redoingbecausemergefailfml
...
Fixes issues with survival pod GPS and Fans not able to be deconstructed
2016-04-30 14:06:27 +02:00
35a975f82b
Merge pull request #17221 from phil235/FixGib
...
Fixes bugs with gib()
2016-04-30 06:58:29 -05:00
e5ed72520e
Ports Cards Against Spess from Polaris (MERGEPLS) ( #15872 )
...
* Ports Cards Against Spess from Polaris
* moar
* more
* Moves cards to config files, adds a fuckton more
* ADDS THE FUCKING CARDS TO THE FUCKING MAP TAKE 3 HATE SALT
* fixes the maps, shuts travis THE FUCK UP
* fixes typo
* makes requested changes
2016-04-30 13:35:51 +02:00
84dcf0dd3f
dammit.
2016-04-30 12:33:12 +02:00
04018648d1
Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib
...
Conflicts:
code/modules/mob/living/death.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-30 12:30:36 +02:00
718d80fa84
Merge pull request #17238 from optimumtact/patch-4
...
Dead code trimming
2016-04-30 05:25:49 -05:00
9feb71f7a6
move legion skull to mining.dmi
2016-04-30 06:03:12 -04:00
03bce7b03d
three two one let's jam
2016-04-30 03:01:38 -07:00
837739df65
Merge branch 'master' of https://github.com/tgstation/-tg-station into lavaland_cuisine
2016-04-30 05:52:50 -04:00
946fac13dd
Cyborg Blueprints
2016-04-30 03:47:51 -05:00
1a18d00fe1
No more mindswapping with bosses
2016-04-30 02:22:43 -05:00
19af2d58d5
Removes "Exosuit Module" from mecha board design names
2016-04-30 10:20:25 +03:00
f4f6a64a1c
Fixes Dragon Log Spam
2016-04-30 02:03:30 -05:00
53fd10c54b
Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake
...
Revert "Move some stuff from different layers to different planes"
2016-04-30 15:34:17 +10:00
2a8faf099b
Goldgrub no longer can burrow into the station floor
2016-04-30 07:12:02 +03:00
381c7e605c
Some HoG tweaks
...
- Automatic nexus placing time changed to 15 minutes(from 2)
- Follow button for divine telepathy for ghosts
- Divine telepathy's color is now God's color.
- Prophet's gear(hat and staff) prioritizes the backpack instead of automatically equipping.
- CTF spawn protection trap is no longer constructable
- Added follow buttons in check antag panel(admins)
- Changed the order of traitor panel for HoG
2016-04-30 00:42:09 -03:00
8a6d36061e
Each cable coil color now has inhands
2016-04-29 22:10:11 -04:00
d662b0e455
Merge pull request #17218 from phil235/FixTalkingInPipes
...
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
1286a8ab18
Fixes MK-HONK shoes spawning useless banana peels
2016-04-30 04:29:06 +03:00
34dd0e5b02
Merge pull request #17018 from KorPhaeron/megafauna
...
Megafauna
2016-04-29 20:27:21 -05:00
5a09b7f8d9
Knocking sound
2016-04-29 19:43:22 -05:00
209a3d3e8e
Legion is behind the door
2016-04-29 19:42:20 -05:00
eecd2942b3
Fixes dragon spamming explosion logs
2016-04-29 17:13:34 -05:00
4bbdeaa9fa
Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers
2016-04-29 17:06:53 -05:00
0bbcc00c4d
Revert "Move some stuff from different layers to different planes"
2016-04-29 16:07:23 -05:00
7c1c35e6d8
Merge pull request #17250 from tgstation/duncathan-patch-1
...
this should deal with those pesky atmos runtimes
2016-04-29 15:38:25 -05:00
c3b91d6e86
fixes #17248
2016-04-29 13:32:35 -06:00
Joan Lung
TechnoAlchemist
MMMiracles
Mercenaryblue
Jordie
Jack Edge
Cheridan
nullbear
Cheridan
AnturK
bgobandit
phil235
TrustyGun
KorPhaeron
c0
Lzimann
KorPhaeron
duncathan salt