3bf8ae1f1a
Merge pull request #12057 from Xhuis/it_worked_in_testing_3
...
Fixes and tweaks to Syndicate medical cyborgs
2015-09-30 23:14:58 +03:00
e08ecefd18
Merge pull request #12066 from feemjmeem/12013-fix
...
tank suicide now drops items in hand, shreds clothing
2015-09-30 23:12:26 +03:00
1aa0e911ae
Merge pull request #11760 from Core0verload/selfrepair
...
Cyborgs update
2015-09-30 22:50:08 +03:00
0108dad7db
Merge pull request #11575 from Firecage/nospaceformining
...
Xeno corrosive acid no longer spaces asteroid walls and floors.
2015-09-30 22:49:10 +03:00
7367ea771c
Merge pull request #12054 from Incoming5643/Boxes_of_the_Spessmen
...
Dials back the boxes [poll]
2015-09-28 23:58:19 -05:00
8d12c310a4
Merge pull request #11994 from bustygoku/Param-Pointers
...
Laser Pointers Use Pixel Params
2015-09-28 15:35:09 -05:00
2f6f8b7362
tank suicide now drops items in hand, shreds clothes to reduce chance of removing items from round
2015-09-28 12:23:40 -07:00
7a8c52b84f
Merge remote-tracking branch 'remotes/upstream/master' into syndiborg_fix
2015-09-28 07:15:49 -04:00
bc2febc021
Merge pull request #12029 from phil235/DeadDna
...
Fixes not being able to save the dna of corpses in the dna console.
2015-09-28 06:36:05 -03:00
129b7b9b2f
Fixes & tweaks
2015-09-27 23:27:18 -04:00
50dd1f6b67
Merge pull request #12031 from Xhuis/a_pretty_rad_pr
...
Radiation changes
2015-09-28 03:24:43 +03:00
7a4be0e04f
Merge branch 'master' of https://github.com/tgstation/-tg-station into Boxes_of_the_Spessmen
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-27 18:48:57 -04:00
52123f879f
There are no more random boxes
...
Maps now have two guaranteed spawns, one in maint and one in the cargo warehouse. You can still build more boxes yourself.
The ! easter egg can now only ever proc once per box. Once it's triggered that's the end of it.
2015-09-27 18:39:44 -04:00
a135f12e3f
Merge pull request #11990 from optimumtact/patch-1
...
Comment war continues
2015-09-27 17:31:48 -03:00
5f99b313cc
Radiation changes
2015-09-26 13:33:27 -04:00
9293cdddb8
Fixes not being able to save the dna of corpses in the dna console.
...
Corpses can now have their dna changed (but they don't acquire mutations). You can use a dna injector on them and modify their dna with the dna console.
2015-09-26 18:04:35 +02:00
c3d978e6d1
Fixes Pixel And Y Check
2015-09-25 19:48:17 -07:00
fc0a110df8
Viewers() Change
2015-09-25 19:26:50 -07:00
191a7ea195
Further Check Changes
2015-09-25 18:59:25 -07:00
b67cbd770b
Oops
2015-09-25 18:44:41 -07:00
c75a62dc7c
Added Check
2015-09-25 18:44:04 -07:00
feeb9ff7d2
Organs update 3
2015-09-25 22:26:15 +03:00
d17f621389
Merge pull request #11972 from KorPhaeron/fix
...
Kitchen Spike Hotfix
2015-09-25 22:05:28 +03:00
76928b467b
Fixes var names
2015-09-25 12:25:51 -05:00
58c5404947
Fix
2015-09-25 12:22:29 -05:00
14d54d3ef2
Merge branch 'duncathan-hemanifolds'
2015-09-25 16:45:57 +03:00
9d8cf0ffe9
Merge branch 'hemanifolds' of https://github.com/duncathan/-tg-station into duncathan-hemanifolds
2015-09-25 16:35:08 +03:00
a687b07eac
f u c k c o n f l i c t s
2015-09-25 14:35:44 +03:00
b9b8734b74
Merge pull request #11966 from MMMiracles/dwarfsman
...
Dwarfism
2015-09-25 12:18:52 +03:00
e1b16b057c
Merge pull request #11964 from Delimusca/durrymunchin
...
ease-of-use smoking improvements
2015-09-24 22:26:22 -05:00
7c757a735f
Merge pull request #11968 from xxalpha/hot_or_not
...
Removed /proc/is_hot() && Removed /proc/is_sharp()
2015-09-25 04:02:52 +03:00
c94fd9b082
Laser Pointers Use Pixel Params
2015-09-24 16:04:14 -07:00
4ba7259666
Comment war continues
...
shake it off
2015-09-25 09:05:22 +12:00
40e97a5f7b
Removes the fun
...
Removes the fun
2015-09-24 23:58:07 +03:00
3c4994749b
Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction
2015-09-24 23:52:38 +03:00
fd0b52f06c
Merge pull request #11920 from Jalleo/ImplantCleanup
...
Cleanup of base implant file and tiny change of my last merged PR
2015-09-24 14:43:21 +02:00
f493bff99c
Fixed merge.
2015-09-24 03:26:52 +01:00
22474094ae
Merge remote-tracking branch 'upstream/master' into hot_or_not
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
3d15d791fb
Merge branch 'edgy' into hot_or_not
...
Conflicts:
code/__HELPERS/unsorted.dm
2015-09-24 03:12:08 +01:00
deb60ae309
Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().
2015-09-24 03:08:28 +01:00
ce9ec8af68
Fixes mobs flipping updside down forever on spikes
2015-09-23 20:13:41 -05:00
655b1a77c7
Replaced refactored is_hot() to be an atom proc.
2015-09-24 01:12:38 +01:00
d3aa84e978
Merge pull request #11937 from KorPhaeron/profligateslikeyoubelongonthecross
...
Hanging any mob from the kitchen spike
2015-09-24 02:14:06 +03:00
99d8e089c4
Merge pull request #11913 from Xhuis/based_space_gods_this_no_smoking_sign_is_troubling_my_autism
...
Minor feature package
2015-09-24 02:12:23 +03:00
5041f46bba
Merge pull request #11910 from Lijah99/RPD_true_suicide
...
Adds a suicide message for the RPD
2015-09-24 02:07:25 +03:00
6ddb1bf1ce
Merge pull request #11904 from Miauw62/newposters
...
Removes the shitty red faction poster and replaces it with two new ones.
2015-09-24 02:06:52 +03:00
1105a2b820
Merge pull request #11899 from kingofkosmos/altclickrotatepipe
...
Alt-click to rotate stuff
2015-09-24 01:59:04 +03:00
01a23d020e
Merge pull request #11848 from xxalpha/smoothlattice
...
Lattices and catwalks now use generic icon smoothing.
2015-09-24 01:39:12 +03:00
aa87f0a785
Merge pull request #11749 from feemjmeem/suicides-sep12
...
updated suicide_acts for newspaper, spraycan, and soap
2015-09-24 01:33:27 +03:00
3d43b8e389
dwarfdwarfdwarf
2015-09-23 18:13:16 -04:00
Razharas
Cheridan
Marc R. Uchniat
Xhuis
Aranclanos
Incoming
phil235
bustygoku
bustygoku
c0
KorPhaeron
Razharas
oranges
phil235
xxalpha
KorPhaeron
MMMiracles