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
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
5d0e800c3d
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
...
Conflicts:
icons/turf/floors.dmi
Fixing merge conflicts
2015-02-17 20:33:52 +03: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
f95dd77509
Merge pull request #7740 from Menshin/nano_solars
...
NanoUIzed Solar Control Computers
2015-02-17 13:53:37 +01:00
18a344e66b
Update adminjump.dm
2015-02-17 13:44:21 +01:00
ec4bc5665c
Allows portable machines to be mounted on any turf that cancable.
2015-02-17 02:27:41 +00:00
52477eb16e
Adds a new spell. The Barnyard curse
...
Created a new file because I didn't want to get rid of the horseman
curse. Essentially the same as the horseman curse but you can also be a
pig and a cow.
2015-02-17 00:44:45 +00:00
a62c0333d6
Merge pull request #7685 from optimumtact/destructnuke
...
Nuclear self destruct option with added centcomm fun
2015-02-16 23:09:29 +01:00
6914fb0ecc
Merge pull request #7756 from dannno/ohnoimlate
...
Oh no! I'm running late!
2015-02-16 20:43:42 +01:00
05e3c305ef
Fixes floating animation not updating correctly.
...
Makes life() procs more object oriented.
2015-02-16 18:56:57 +01:00
0f9cc3aa49
Admin logging for Experimentor Relics
...
- Adds admin logging for PetSpray, Flash, and Exploding relics.
- Also fixes some of the oview() based procs.
2015-02-16 11:16:02 -06:00
ab3b588ad7
Fixes rapidDupe proc not deleting all the dupe it creates
...
Fixes dupes always being thrown in the same direction.
Fixes being able to spam click the relic to avoid the cooldown limitation.
2015-02-16 14:03:57 +01:00
d906b87a8e
Description change
...
Added the regular insulated glove description to the start of the fake
glove description.
2015-02-16 12:52:40 +00:00
702419f265
Merge remote-tracking branch 'upstream/master' into glovening
2015-02-16 12:24:06 +00:00
9f471cb7e4
Reworks fake yellows
...
Replaces the varedited white gloves in the maint loot spawner list with
a subtype of insulated gloves, with the siemens coefficient changed to 1
and a different desc.
2015-02-16 12:20:06 +00:00
71758715fa
some typo fixes
2015-02-15 13:33:15 -08:00
8b12b14f59
hospistol and disabler stun revolver
2015-02-15 13:31:31 -08:00
bef844fb89
i hope senpai isnt mad at me
2015-02-15 14:15:02 -05:00
c2c015a91a
Fixes conflicts, fixes casually worn uniforms looking weird
2015-02-15 13:07:06 -05:00
0fb9ae24e5
Merge branch 'master', repair conflicts, add changelog
2015-02-15 12:09:24 -05:00
85ff51b3f7
Merge pull request #7753 from Cheridan/master
...
Manual Merge of #7724
2015-02-15 10:34:26 -06:00
15439b8c4e
Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
...
Conflicts:
code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
9402d8c20c
Removes 2 commented out lines.
2015-02-15 14:01:45 +00:00
4bebfaefc3
Procedural Map Generator System
2015-02-15 12:08:02 +00:00
71dd648fc1
Merge pull request #7749 from Cheridan/master
...
Manual Merge of #7057
2015-02-14 23:21:12 -06:00
1ad51c8201
Merge branch 'qoladv' of git://github.com/tkdrg/-tg-station into tkdrg-qoladv
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-02-14 23:16:02 -06:00
287a0147a4
Merge pull request #7744 from Cheridan/master
...
Manual Merge of #7005
2015-02-14 22:48:40 -06:00
c0d286ca72
Merge branch 'chem_synth' of git://github.com/lolnon/-tg-station into lolnon-chem_synth
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-02-14 22:42:42 -06:00
a80e4a7e25
Fixes #7741
...
Fixes #7741 , the Experimentor's tech improvement malfunction now works
as expected.
2015-02-14 22:22:57 -06:00
9c53764675
Merge pull request #7680 from Deantwo/ReadySpam
...
Fixes ready spam
2015-02-14 22:21:06 -06:00
54fec53ba2
changelog and compile fix
2015-02-14 19:40:11 -08:00
a264b85cb3
Sneaky scroll bars
2015-02-15 02:57:27 +01:00
26213d59aa
* Converted solar control computers interfaces to NanoUI
...
* Removed some now unused code
2015-02-15 02:39:48 +01:00
b2071bfdbf
borg updates
2015-02-14 17:38:17 -08:00
bca3242b3c
small nerf to resonators
2015-02-14 17:34:04 -08:00
f6942bb955
Merge branch 'miening' of https://github.com/paprka/-tg-station into miening
2015-02-14 17:26:19 -08:00
066b2762d3
lots of crap
2015-02-14 17:25:45 -08:00
Mandurrrh
phil235
Razharas
Menshin
GunHog
phil235
Swag McYolosteinen
xxalpha
Sometinyprick
Thunder12345
paprka
dannno
Incoming
Cheridan
Remie Richards
Menshin