145175342f
Makes NPC queens/drones plant weeds/eggs
2015-02-21 18:31:21 +01:00
51b4bbf71e
Revert "Allows portable machines to be mounted on any turf that can have cables."
2015-02-21 02:29:29 +03:00
fe3764dae8
Merge pull request #7765 from Thunder12345/glovening
...
[REFACTOR] Reworks maintenance fake insulated gloves
2015-02-20 14:24:54 -06:00
ac00052da6
Merge pull request #7780 from xxalpha/catwalkmachines
...
Allows portable machines to be mounted on any turf that can have cables.
2015-02-20 13:32:44 -06:00
6d78f9b77d
Merge pull request #7828 from Incoming5643/let_us_never_speak_of_this_again
...
Removes the unintended ability to have sex with cats
2015-02-20 13:18:46 -06:00
23677f4df1
Merge pull request #7808 from phil235/CookingTweaks
...
Cooking Tweaks
2015-02-20 12:02:04 -06:00
b67569869b
Merge pull request #7843 from Mandurrrh/fixforbooze
...
Fixes issue #7841
2015-02-20 18:51:29 +01:00
7af2e457c8
Merge pull request #7705 from GunHog/NVG_Mesons
...
Adds NVG Mesons
2015-02-20 17:44:38 +01:00
3e43beab29
Fixes issue #7841
2015-02-20 09:15:20 -05:00
e4fa3369f2
Merge pull request #7743 from GunHog/YetAnotherExperimentorFix
...
Fixes E.X.P.E.R.I-MENTOR blood sacrifice!
2015-02-20 09:51:55 +03:00
452aa3d961
Merge pull request #7791 from Mandurrrh/Booze
...
Adds fountain machines for bar.
2015-02-20 09:19:42 +03:00
383e4e7111
Merge pull request #7792 from Menshin/regen_statis_tweaks
...
Regenerative statis tweaks
2015-02-19 13:07:24 -08:00
ea12d68e60
Merge pull request #7817 from paprka/whatthefucktg
...
Syndicate shotguns spawn with buckshot by default
2015-02-19 13:07:08 -08:00
5365dd1438
Merge pull request #7799 from paprka/magshit
...
removes bloat from magazines icons
2015-02-19 21:01:46 +03:00
66720a5ce9
Merge pull request #7834 from Menshin/telexploit_fix
...
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:39:49 +01:00
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
83db82e62d
Fixed a typo
2015-02-19 11:52:40 +01:00
0cd74ff882
Merge pull request #7717 from phil235/sechailerAdjustFix
...
Fixes the cyborg sechailer being adjustable.
2015-02-18 21:50:12 -08:00
9b91896897
Merge pull request #7769 from phil235/rapidDupeProcFix
...
Fixes bugs with experimentor relics with rapidDupe proc.
2015-02-18 21:49:48 -08:00
c99ee72b55
Merge pull request #7788 from phil235/NeurotoxinReactionFix
...
Fixes neurotoxin reaction's required temperature.
2015-02-18 21:49:01 -08:00
dbee9709d1
Merge pull request #7790 from phil235/CryoStingExploitFix
...
Fixes cryosting detection exploit
2015-02-18 21:48:45 -08:00
90e0a00298
Merge pull request #7786 from phil235/SiliconGrabFix
...
No more silicon grabbing.
2015-02-18 21:48:30 -08:00
da4f8e74d8
Merge pull request #7733 from Cheridan/reagent_foam
...
Reagent Foam
2015-02-18 21:43:50 -08:00
e94e94a5e2
fixes #7827
2015-02-19 00:23:56 -05:00
dda1bd3b2d
Merge branch 'lib-sucks-no-homo' of https://github.com/MrStonedOne/-tg-station into lib-sucks-no-homo
...
Conflicts:
code/modules/library/lib_machines.dm
2015-02-18 18:26:39 -08:00
c0af9cc320
Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo
...
Conflicts:
code/modules/library/lib_machines.dm
2015-02-18 18:23:05 -08:00
5addddb1d4
Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo
...
Conflicts:
code/modules/library/lib_machines.dm
2015-02-18 18:20:16 -08:00
6a9ea4c9ec
Ports tkdrg's library computer caching system.
...
This helps mitigate lag caused by the computer grabbing meta information about almost **two thousand books** over sql on EVERY load of the library computer interface
2015-02-18 18:03:39 -08:00
efbb4f5116
makes syndicate shotguns spawn with buckshot by default
2015-02-18 14:10:46 -08:00
30eb4e342a
Merge pull request #7652 from Incoming5643/Circumstantial_Dickpixel
...
Tactical dickpixel™ removal
2015-02-18 21:07:08 +01:00
abd604f785
derp
2015-02-18 20:59:42 +01:00
c0d7015fe6
Adds renaming custom food with a pen.
...
Adds a changelog.
2015-02-18 19:55:42 +01:00
fa00cee00c
Fixes that damn typo FOR REAL THIS TIME
2015-02-18 11:53:20 -06:00
262e7e5b5f
Tweaking cake nutriment amounts
2015-02-18 14:27:41 +01:00
024559f801
Buffs nutriment amounts in doughs and their cooked counterparts, as well as meats.
...
Fixed a recipe.
2015-02-18 14:02:18 +01:00
1ac0c26655
Merge pull request #7770 from phil235/AnimationsFix
...
Floating animation and life() fixes.
2015-02-18 02:27:28 -06:00
15e2b88a0f
removes bloat from magazines icons
2015-02-17 19:43:20 -08:00
6d23db48d4
This is a combination of 7 commits.
...
Adds fountain machines for bar.
Changed soda to drink updated code/mappaths
2015-02-17 19:14:41 -05:00
dcf99380b6
Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos
...
Introducing the Ion Carbine!
2015-02-18 00:16:33 +01:00
89df7f351d
* Getting into regenerative statis now put the changeling into unconscious state
...
* Fixed reviving not working
2015-02-17 22:04:58 +01:00
9d7b7a34ae
Fixes my merge error.
2015-02-17 14:47:26 -06:00
cc3402f0bb
No more bubbling sound when reaction happens inside a mob.
2015-02-17 20:43:26 +01:00
6e938b5cd7
Fixes cryosting exploit by removing ice reagent from cryosting, removing the beer+frostoil= icedbeer (ice+beer=iced beer already exists), and buffing frostoil effect to compensate.
2015-02-17 19:54:14 +01:00
b887774b3f
Fixes neurotoxin reaction's required temperature.
2015-02-17 19:29:24 +01:00
dcd20969a7
Merge pull request #7730 from Incoming5643/mediborg_tools
...
Mediborg Improvement Drive: Tool Time
2015-02-17 19:11:28 +01:00
6ebd5976f5
Merge pull request #7729 from Incoming5643/mediborg_gauze
...
Mediborg Improvement Drive: The man in gauze
2015-02-17 18:17:59 +01:00
e09dd08054
Remove aliens grabbing silicons.
2015-02-17 18:03:24 +01:00
7a40b51d4a
Merge pull request #7731 from Incoming5643/mediborg_drugs
...
Mediborg Improvement Drive: Reefer Madness
2015-02-17 15:37:39 +01:00
df107499d1
No more silicon grabbing.
2015-02-17 14:59:12 +01:00
ce1ae70d1a
Merge pull request #7723 from Miauw62/welpwelp
...
Fixes walls becoming nondense due to adminteleport.
2015-02-17 14:28:03 +01:00
AnturK
Razharas
Cheridan
Swag McYolosteinen
phil235
Mandurrrh
hornygranny
Menshin
phil235
Incoming
MrStonedOne
paprka
TheVekter
GunHog