59c7c7968d
Reorgansies Drones into multiple files. Drones now have 2 skins to choose from (With easier support for more). Drones now see static instead of other mobs (Except Drones)
2015-02-20 14:21:25 +00:00
3e43beab29
Fixes issue #7841
2015-02-20 09:15:20 -05:00
55dcc82f45
fixes leftover delay line
2015-02-20 01:58:32 -08: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
1221f012c6
Breach to Disable
2015-02-20 11:41:56 +08: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
42fe551665
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00: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
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00: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
dbc6b91921
Merge branch 'updaterclean' into zipzaps
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-18 22:03:03 -07:00
4f6c74d291
replaces turret egun with ecannon
2015-02-18 21:24:07 -07: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
b5ab97af83
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
2015-02-19 01:58:01 +03:00
f9047c7a1c
Admin logging for experimentor itself
...
- Admin logging for the chemleak event (Mutation, Xenogas, Borging gas)
- Fix for empty pick() runtime
2015-02-18 16:50:11 -06:00
5efd05ec00
Changelog and vineturf sanity checks
...
Added changelog and disabled most of floor procs for vines
2015-02-19 01:48:12 +03:00
efbb4f5116
makes syndicate shotguns spawn with buckshot by default
2015-02-18 14:10:46 -08:00
29f48bfda4
conflicts more like con-fixed
2015-02-18 16:20:46 -05: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
388e0a330e
fixes firing delay
2015-02-18 02:55:28 -08:00
074a139576
Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-18 02:29:07 -08:00
1ac0c26655
Merge pull request #7770 from phil235/AnimationsFix
...
Floating animation and life() fixes.
2015-02-18 02:27:28 -06:00
8b53405b17
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-18 12:50:05 +08: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
a85099ac5a
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
2015-02-18 01:30:47 +03:00
d775291bdf
Made vines cultivatable
...
Added special proc to all seeds that give plant anazyler special
information if needed in form of list of strings that will be displayed
to user one by one
Added special proc to seeds that make them have some special chem
interactions on growth if needed
Made vine mutations have quality of either good, bad or neutral
Made some chems remove the mutations of certain quality from growing
seeds
Made some chems tweak potency and production of the growing vine seeds
both ways so you can make unmutatable slowly growing vines if needed
Vine seeds now show mutations on the plant analyzing
Cut some copypaste in analyzer proc
2015-02-18 01:27:52 +03: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
Remie Richards
Mandurrrh
paprka
Razharas
Steelpoint
hornygranny
phil235
Menshin
phil235
Incoming
Delimusca
MrStonedOne
Razharas
GunHog
paprka
dannno
TheVekter
Cheridan