Xhuis
e1f815c5c6
Optimizes radiation pulse calculation
2015-09-30 13:19:05 -04:00
bgobandit
26b8112dea
Adds additional items to the storage of many coats and oversuits.
2015-09-29 22:29:07 -04:00
Cheridan
7367ea771c
Merge pull request #12054 from Incoming5643/Boxes_of_the_Spessmen
...
Dials back the boxes [poll]
2015-09-28 23:58:19 -05:00
KorPhaeron
7fa35114fa
Captain
2015-09-28 20:16:08 -07:00
Cheridan
8d12c310a4
Merge pull request #11994 from bustygoku/Param-Pointers
...
Laser Pointers Use Pixel Params
2015-09-28 15:35:09 -05:00
Marc R. Uchniat
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
Xhuis
7a8c52b84f
Merge remote-tracking branch 'remotes/upstream/master' into syndiborg_fix
2015-09-28 07:15:49 -04:00
Aranclanos
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
Xhuis
129b7b9b2f
Fixes & tweaks
2015-09-27 23:27:18 -04:00
Razharas
50dd1f6b67
Merge pull request #12031 from Xhuis/a_pretty_rad_pr
...
Radiation changes
2015-09-28 03:24:43 +03:00
Incoming
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
Incoming
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
Aranclanos
a135f12e3f
Merge pull request #11990 from optimumtact/patch-1
...
Comment war continues
2015-09-27 17:31:48 -03:00
Remie Richards
131b69474e
Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
...
Conflicts:
code/__HELPERS/unsorted.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/modules/client/preferences.dm
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/mob/mob.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/items.dmi
icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
Remie Richards
58483beb50
Hand of god gamemode!
...
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01:00
Fox-McCloud
32cd0d49bb
soap for the janitor
2015-09-27 07:07:27 -04:00
Fox-McCloud
960f0b3129
adds in bluespace trashbag
2015-09-26 18:07:16 -04:00
AnturK
c23eb50454
Fixes trying to buckle to mob with another already buckled.
2015-09-26 22:06:53 +02:00
Xhuis
5f99b313cc
Radiation changes
2015-09-26 13:33:27 -04:00
phil235
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
Fox-McCloud
6ca0a1ad40
Re-Adds Advanced Mop
2015-09-26 06:42:57 -04:00
bustygoku
c3d978e6d1
Fixes Pixel And Y Check
2015-09-25 19:48:17 -07:00
bustygoku
fc0a110df8
Viewers() Change
2015-09-25 19:26:50 -07:00
bustygoku
191a7ea195
Further Check Changes
2015-09-25 18:59:25 -07:00
bustygoku
b67cbd770b
Oops
2015-09-25 18:44:41 -07:00
bustygoku
c75a62dc7c
Added Check
2015-09-25 18:44:04 -07:00
c0
feeb9ff7d2
Organs update 3
2015-09-25 22:26:15 +03:00
Razharas
d17f621389
Merge pull request #11972 from KorPhaeron/fix
...
Kitchen Spike Hotfix
2015-09-25 22:05:28 +03:00
KorPhaeron
76928b467b
Fixes var names
2015-09-25 12:25:51 -05:00
KorPhaeron
58c5404947
Fix
2015-09-25 12:22:29 -05:00
Razharas
14d54d3ef2
Merge branch 'duncathan-hemanifolds'
2015-09-25 16:45:57 +03:00
Razharas
9d8cf0ffe9
Merge branch 'hemanifolds' of https://github.com/duncathan/-tg-station into duncathan-hemanifolds
2015-09-25 16:35:08 +03:00
c0
a687b07eac
f u c k c o n f l i c t s
2015-09-25 14:35:44 +03:00
Razharas
b9b8734b74
Merge pull request #11966 from MMMiracles/dwarfsman
...
Dwarfism
2015-09-25 12:18:52 +03:00
Cheridan
e1b16b057c
Merge pull request #11964 from Delimusca/durrymunchin
...
ease-of-use smoking improvements
2015-09-24 22:26:22 -05:00
Razharas
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
bustygoku
c94fd9b082
Laser Pointers Use Pixel Params
2015-09-24 16:04:14 -07:00
oranges
4ba7259666
Comment war continues
...
shake it off
2015-09-25 09:05:22 +12:00
Razharas
40e97a5f7b
Removes the fun
...
Removes the fun
2015-09-24 23:58:07 +03:00
Razharas
3c4994749b
Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction
2015-09-24 23:52:38 +03:00
AnturK
a99ed56f27
Atom Buckling - Squashed
2015-09-24 16:21:05 +02:00
phil235
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
xxalpha
f493bff99c
Fixed merge.
2015-09-24 03:26:52 +01:00
xxalpha
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
xxalpha
3d15d791fb
Merge branch 'edgy' into hot_or_not
...
Conflicts:
code/__HELPERS/unsorted.dm
2015-09-24 03:12:08 +01:00
xxalpha
deb60ae309
Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().
2015-09-24 03:08:28 +01:00
KorPhaeron
ce9ec8af68
Fixes mobs flipping updside down forever on spikes
2015-09-23 20:13:41 -05:00
xxalpha
655b1a77c7
Replaced refactored is_hot() to be an atom proc.
2015-09-24 01:12:38 +01:00
Razharas
d3aa84e978
Merge pull request #11937 from KorPhaeron/profligateslikeyoubelongonthecross
...
Hanging any mob from the kitchen spike
2015-09-24 02:14:06 +03:00
Razharas
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