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
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
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
960f0b3129
adds in bluespace trashbag
2015-09-26 18:07:16 -04: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
6ca0a1ad40
Re-Adds Advanced Mop
2015-09-26 06:42:57 -04: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
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
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
655b1a77c7
Replaced refactored is_hot() to be an atom proc.
2015-09-24 01:12:38 +01: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
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
5a798a7210
cig lighting user feedback
2015-09-23 15:25:35 -06:00
e971423dc6
removed targetzone checks from smoking stuff
2015-09-23 15:16:11 -06:00
e9bed91a1e
Merge pull request #11925 from Core0verload/matter-final
...
Materials - final solution
2015-09-23 21:11:17 +03:00
6711406d6a
Conflicts 2/3
2015-09-22 16:37:00 -04:00
835da91620
Merge pull request #11883 from phil235/DnaMonkeyStuff
...
DNA rework
2015-09-22 18:43:27 +03:00
66f67946ae
Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff
2015-09-21 22:18:24 -04:00
2fd2f96238
Simplified update_mutations_overlay(), we no longer rebuild the entire mutation layer with all mutations every time we get or lose a mutation. I reintroduced in on_acquiring and on_losing some code similar to the old lose_indication gain_indication procs.
...
Fixed lesser form changeling, when humanized via dna injector, the ling no longer keeps its Human Form power.
Simplified the racemut trick in humanize() and monkeyize().
Dna now gets qdel'd, just like reagents, when the mob gets qdel'd.
Some tiny fixes here and there.
Added a changelog.
2015-09-22 02:14:37 +02:00
8d54f835ae
Materials - final solution
2015-09-22 00:18:37 +03:00
38234c97ee
Merge pull request #11798 from AnturK/displaycase
...
Buildable Display Cases
2015-09-21 22:09:10 +03:00
836c31ac83
Merge pull request #11845 from xxalpha/nanites
...
Added a self-repair module for cyborgs.
2015-09-21 22:06:45 +03:00
ddf2ef1f9c
Cleans up the implant.dm by splitting it up into multiple files with only generic implant files being in implant.dm now.
...
Also changes tracking_implants list to tracked_implants to make it more clearer
2015-09-21 17:56:58 +01:00
33b0919e7d
Merge pull request #11816 from Jalleo/ImplantTrackingFix
...
Improves implant tracking by using a list instead of world
2015-09-21 18:10:38 +02:00
f26f6145ac
Add even more tracking fixes to improve performance
2015-09-21 17:06:11 +01:00
884efcb308
adds a suicide message for the rpd
2015-09-20 20:30:28 -06:00
6ee5ab6680
Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
...
Conflicts:
code/__HELPERS/unsorted.dm
code/modules/admin/verbs/one_click_antag.dm
2015-09-19 22:34:30 +02:00
Cheridan
Marc R. Uchniat
Xhuis
Aranclanos
Razharas
Remie Richards
Fox-McCloud
phil235
bustygoku
bustygoku
c0
Razharas
phil235
xxalpha
MMMiracles
unknown
blah
Swag McYolosteinen
Lijah99