6140a61de7
Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
...
Conflicts:
code/modules/food&drinks/food/snacks_pastry.dm
2015-01-21 20:25:45 +11:00
561c414ea7
Merge pull request #7134 from AnturK/assemblies
...
Makes assembly parts work with wires
2015-01-21 04:57:23 -03:00
4a82ff1564
Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
...
Conflicts:
code/modules/reagents/reagent_containers/bottle.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-01-21 16:54:40 +11:00
8f98597490
Merge pull request #7049 from RemieRichards/PipesAndBuckles
...
Buckling Refactor + HE Pipe heat based colour
2015-01-20 20:07:18 -06:00
e4891e37d5
Merge pull request #7227 from Alek2ander/howdidyouexpectthistowork
...
Fixes genetics
2015-01-20 21:05:44 -03:00
7de9a6e1ca
Merge pull request #6990 from Incoming5643/only_you_can_prevent_horrific_floating_brains
...
Magic Mania 1.83: Attack of the Flying Invisible Magic Brains!
2015-01-20 20:20:07 -03:00
6eee450855
Fixes genetics
2015-01-20 23:01:35 +03:00
96ac837b65
Merge pull request #6960 from Iamgoofball/goonetics
...
Added 2 new powers and 9 new disabilities from goon and /vg/!
2015-01-19 17:47:33 +00:00
3bd637b186
Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
...
Conflicts:
code/modules/reagents/reagent_containers/bottle.dm
code/modules/reagents/reagent_containers/hypospray.dm
code/modules/reagents/reagent_containers/patch.dm
code/modules/reagents/reagent_containers/pill.dm
2015-01-19 18:28:38 +11:00
a643ecdfcc
Food and drinks refactor
2015-01-19 18:06:15 +11:00
612e78e1ec
whoops, broke some proc names
2015-01-18 22:57:41 -08:00
98ecd7ffdc
Merge pull request #7131 from Iamgoofball/goonchem_shoehorn_backup
...
Goon Chemistry: Addiction and Overdosing
2015-01-19 03:32:57 -03:00
b83ca5f8d1
Goon Chemistry: Addiction and Overdosing
2015-01-18 21:50:54 -08:00
b64efc6b54
Adds 3 new disabilities
2015-01-17 18:55:41 -08:00
a2fe7f0352
bloat killer 9000
2015-01-17 16:36:27 -08:00
a8ddd45690
Makes assembly parts work with wires
2015-01-17 18:08:55 +01:00
35cc6e3c54
Replaces pathing.
2015-01-16 18:21:01 -08:00
38070820f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup
2015-01-16 17:25:50 -08:00
f3398e58a9
Removes Star Trek chemistry and transfers us to Goon Chemistry.
2015-01-16 17:21:36 -08:00
ab7d50c90e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/guns/projectile/launchers.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/research/designs/weapon_designs.dm
icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
5f46ebe2b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-15 16:14:27 -06:00
17654037db
Ports Mloc's Refactor of buckling, All /obj can now buckle things. HE Pipes now change colour based on heat.
2015-01-14 19:07:18 +00:00
674b3b65c0
Merge pull request #6968 from phil235/LockdownMalfFix
...
Fixes malf AI lockdown affecting doors on away missions
2015-01-14 14:58:10 -03:00
7fe46696d2
Merge pull request #6963 from Boggart/wizrepulse
...
Adds a new spell, Repulse.
2015-01-14 14:36:00 -03:00
a54b57f629
Adds span classes to repulse spell.
2015-01-14 02:02:17 -07:00
82bff079c7
Merge pull request #6137 from Iamgoofball/byond
...
Goon Chemistry [FINISHED]
2015-01-14 02:31:56 -03:00
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
430b613ef4
Merge pull request #6984 from tkdrg/sanitaiz
...
Replaces a bunch of input() with stripped_input()
2015-01-13 19:32:25 +01:00
1c090e02b7
Merge pull request #6787 from paprka/serviceandsupply
...
Separates supply from civilian (service) jobs
2015-01-13 02:19:30 -06:00
4bd70b2908
Merge pull request #6986 from Menshin/ear_damage_ooping
...
Ear damage/deafness tidying
2015-01-13 01:19:56 -06:00
6679b67b89
-Adds pin supply pack
...
-Updates armory
2015-01-12 23:35:57 -06:00
5a91ce4fee
Requested changes by @Cheridan
2015-01-12 20:38:56 -08:00
f8e1fac30c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-12 21:29:00 -06:00
435ccf7ff9
* OOP'ed ear damages/deafness status updating
...
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
2015-01-13 00:40:46 +01:00
38bc14c8f8
Tweaks and changes
2015-01-11 20:35:17 -08:00
c46cefd8ff
Locks up teleportation spells behind a var, nonabstract_req, that keeps pAI and brain mobs from leaving their respective jail objects.
...
The crew is none the less emphatically warned of the hilarious danger of putting magic brains in MMIs.
2015-01-11 22:02:19 -05:00
b852aa41ea
Replaces a bunch of input() with stripped_input()
...
Some of these were exploitable for XSS, as well.
2015-01-11 19:02:53 -03:00
493dd27679
Merge branch 'master' of https://github.com/tgstation/-tg-station into byond
...
Conflicts:
code/modules/reagents/Chemistry-Machinery.dm
code/modules/reagents/reagent_containers/glass/bottle.dm
2015-01-11 09:53:49 -08:00
a55e6a70be
Fixes malf AI lockdown affecting doors on z levels other than station and mining.
...
Replaces a lot of z level numbers in code by their respective defines.
Adding a define for the Mining asteroid z level.
2015-01-11 15:39:32 +01:00
1d9f7a9a51
Tweaks the upgrade benefit for repulse a bit.
2015-01-11 01:09:28 -07:00
b70fde1ed2
Fixes and Tweaks, adds mutations_say_mods() and say_mod() for mutations
2015-01-10 23:42:31 -08:00
27e4192c26
Gives repulse an overlay on thrown things and fixes the spellbook entry for it.
2015-01-10 23:17:25 -07:00
39ede45b31
Added 2 new powers and 9 new disabilities!
2015-01-10 21:51:24 -08:00
a6ae15215a
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenFixes
2015-01-11 08:48:03 +03:00
bfda5b49f9
Last pack of fixes for now
...
Fixed indentation in transform proc
Moved comments to appropriate place
Fixed unreported cloning bug
Removed monkifying from random bad mutations
2015-01-11 08:23:50 +03:00
cb43a8d69f
Adds repulsion spell for wizards.
2015-01-09 23:43:41 -07:00
0956a86c22
Firing Pin System - The Lockbox Solution
2015-01-09 18:49:02 -06:00
4d34f2235e
Fox 2.0
...
https://github.com/tgstation/-tg-station/pull/6489/
2015-01-09 16:41:37 -06:00
40e5476a53
Merge pull request #6598 from Incoming5643/InstantSummons
...
Magic Mania 1.81: Instant summons!
2015-01-09 03:29:15 -03:00
69280f6b9b
Merge pull request #6879 from dannno/bandolier
...
Adds shotgun bandoliers
2015-01-08 22:47:09 -03:00
Jordie0608
tkdrg
Cheridan
Alek2ander
Remie Richards
Iamgoofball
paprka
AnturK
Cheridan
Boggart
Swag McYolosteinen
Menshin
Incoming
phil235
Razharas
Nienhaus