0850fc626e
Merge pull request #8358 from CandyClownTG/patch-1
...
Update fancy.dm
2015-03-17 17:09:37 +11:00
d40efa9cd8
fixes the recipe
2015-03-16 21:14:32 -07:00
7600697c13
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-03-16 21:13:56 -07:00
8701459651
Fixes and changelog update
2015-03-16 20:46:51 -07:00
6032c3d966
Minor Experimentor relic tweaks
...
- Nerfs the explosion relic so it can only explode once.
- The PetSpray relic now has a chance to destroy itself on use.
- Prevents the Experimentor re-rolling the function of a relic.
- Added low priority logging for the rest of the relics.
- Fixed the relic messages not showing to the user.
2015-03-16 15:57:29 -05:00
734640b43b
fixes issue with admin preferences applying to non-admins
...
fixes issue with admin preferences applying to non-admins.
This is a preference that only admins can change, but if a users save file gets fucked, or a admin who turned it off gets de-admined. it still applies to them.
I don't know why this even exists, it seems to have been around since google code, maybe even since goonleak, but it should be checking for admin before applying to peoples nonetheless.
2015-03-16 13:08:54 -07:00
f7be7fb711
Merge pull request #8377 from Miauw62/AAAAA
...
Fixes #8375
2015-03-16 19:26:26 +00:00
670aac5785
Should properly unfuck savefiles
2015-03-16 20:12:09 +01:00
5242a08a2b
Fixes #8375
...
UNTESTED I DONT KNOW WHAT IS GOING ON AAAAAAA
2015-03-16 20:03:05 +01:00
b87300e712
Fixes donuts not having a uniquee filling color
2015-03-16 19:51:06 +01:00
4b596b4b72
Small optimization.
2015-03-16 18:16:12 +00:00
9af4972c40
Movement slowdowns only ignored with a jetpack.
2015-03-16 17:49:05 +00:00
41279b3c03
Fixes spawned food not having normal amounts of nutriment and other reagents.
...
Upgraded microwave now adds more nutriment, vitamin and other reagents to the food it cooks.
2015-03-16 18:47:01 +01:00
9c148ff13e
Merge pull request #8315 from phil235/BigUserdanger
...
Makes the message when you're attacked slightly bigger
2015-03-16 18:30:21 +11:00
fb6aa85094
Merge pull request #8274 from Thunder12345/techshellening
...
Shotgun party, new shells, an improvement and a fix
2015-03-16 18:30:14 +11:00
485231c7f8
security officers once again have the choice of a normal headset
2015-03-15 23:32:54 -05:00
5c813bfd72
No additional movement delay when using a jetpack in zero gravity.
...
Remove unnecessary checks.
2015-03-16 04:08:12 +00:00
2ca9e8e392
Spring Event Day 1: Martyr Objective!
2015-03-15 22:50:25 -05:00
e104508a92
Refactor New() proc of vending machines.
...
Fixes spawned vending machine being empty (constructable or not).
2015-03-16 03:04:35 +01:00
1d9d781b59
Adds a little consent system for sentience potions
...
Fixes an unreported runtime
2015-03-15 20:54:36 -04:00
2e43283964
Fix runtime.
2015-03-16 00:44:10 +00:00
fcd6718c56
Merge pull request #8309 from phil235/BurgerSpriteFix
...
Fixes burger and sandwich ingredient stacking and sprites.
2015-03-16 01:40:15 +03:00
2830325e4e
Merge pull request #8173 from AnturK/flagfix
...
Fixes pref flags
2015-03-15 23:02:58 +01:00
d7f29d770c
Merge pull request #8113 from Xhuis/boom_boom_shake_the_room
...
Restores gibbing for suicide C4
2015-03-15 22:50:12 +01:00
aaac85707f
Merge pull request #8204 from Iamgoofball/patch-41
...
Nerfs acid blob again
2015-03-15 15:56:23 -05:00
ca132952f9
Fixes the ore redemption machine outputting zero amount stacks.
2015-03-15 19:26:54 +00:00
c9d600e653
Fixes stack duping.
2015-03-15 19:04:07 +00:00
4f1e20bd84
Merge pull request #8348 from phil235/DoughHotfix
...
Fix dough and cakebatter recipes.
2015-03-15 16:30:20 +03:00
78d28a6d64
Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
...
Conflicts:
code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
e3e881e6ee
Merge branch 'master' of https://github.com/tgstation/-tg-station into MimanaFix
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
2015-03-15 12:27:40 +01:00
791b229388
Merge branch 'master' of https://github.com/tgstation/-tg-station into BurgerSpriteFix
...
Conflicts:
icons/obj/food.dmi
2015-03-15 12:21:45 +01:00
5cc3b68d6a
pong
2015-03-15 05:22:07 -04:00
05097332ce
ding
2015-03-15 05:08:29 -04:00
cb07696814
Merge pull request #8319 from MMMiracles/bearpelts4everyone
...
Ability to put bears on meat spikes.
2015-03-15 02:34:07 -05:00
d8b1cc36b7
Merge pull request #8328 from Miauw62/asdfjo
...
Chat toggles are saved to the savefile properly again.
2015-03-15 02:20:09 -05:00
3bc34e5383
Merge pull request #8310 from phil235/RussianRevolverFix
...
Fixes russian revolver's special mechanism message
2015-03-15 01:57:46 -05:00
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05:00
abb835b487
revamps ERT hardsuits to use the helmet toggle, organizes the listing to be slightly better looking.
2015-03-15 02:03:18 -04:00
4def104810
Makes smoke effect all /mob/living.
2015-03-14 22:26:14 -07:00
5fd5d0b8c1
Color cleaning effects removed from space cleaner and water pending future changes to colors in a future PR.
2015-03-14 22:24:58 -07:00
d0f101cd37
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-03-14 21:32:13 -07:00
33ffd33180
fixes and tweaks
2015-03-14 21:13:23 -07:00
8e2962c4ab
Merge pull request #8255 from GunHog/SiliconVerbFix
...
Fixes "Sensor Augmentation" showing in silicon verbs
2015-03-14 23:08:19 -05:00
1732ab6b02
Merge pull request #8311 from phil235/SprayFix
...
Fixes chemsprayer duplicating reagents. Simplifying its code.
2015-03-14 22:59:49 -05:00
0b7be73f62
Merge pull request #8286 from phil235/SteelcapFix
...
Steel cap, sandstone and welding fixes plus flashing refactor
2015-03-14 22:56:37 -05:00
7114d5ac04
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Goon-Medicine.dm
2015-03-14 20:00:35 -07:00
fa75aed6d3
Reverts 3tick and 1tick
2015-03-14 19:51:54 -07:00
87f0f44112
Update fancy.dm
...
Replaced Doctor's Delight with Omnizine to make Syndicate Smokes useful again.
2015-03-14 21:20:33 -04:00
94bb6f9fd6
lmao
2015-03-14 21:04:37 -04:00
8ee898d67a
ayy
2015-03-14 21:04:11 -04:00
Jordie
Iamgoofball
GunHog
MrStonedOne
Remie Richards
Swag McYolosteinen
phil235
xxalpha
pudl
Cheridan
Incoming
Razharas
phil235
Cheridan
MMMiracles
CandyClownTG