Razharas
653e5d18f3
Merge pull request #12027 from Fox-McCloud/advancedmop
...
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
2015-10-04 05:13:48 +03:00
Razharas
d46f6b582f
Merge pull request #12079 from bgobandit/boxshit
...
Adds additional items to the storage of many coats and oversuits.
2015-10-03 18:13:03 +03:00
Cheridan
207f6a6048
Merge pull request #12108 from Jordie0608/tilessolightyoucantevenseethem
...
Fixes #11268 , iconless wired glass tiles
2015-10-03 09:24:07 -05:00
Jordie
c6627b3d70
Fixes iconless wired glass tiles
2015-10-02 21:28:19 +10:00
bgobandit
8e82cf324a
Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit
...
Conflicts:
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-10-02 00:41:19 -04:00
Razharas
54d9e6924d
Merge pull request #11868 from bgobandit/diditallforthelewdbe
...
Adds kitty mousey toys!
2015-10-01 05:06:34 +03:00
Razharas
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
Razharas
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
Razharas
1aa0e911ae
Merge pull request #11760 from Core0verload/selfrepair
...
Cyborgs update
2015-09-30 22:50:08 +03:00
bgobandit
26b8112dea
Adds additional items to the storage of many coats and oversuits.
2015-09-29 22:29:07 -04: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
Fox-McCloud
960f0b3129
adds in bluespace trashbag
2015-09-26 18:07:16 -04: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
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
Razharas
3c4994749b
Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction
2015-09-24 23:52:38 +03: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
xxalpha
655b1a77c7
Replaced refactored is_hot() to be an atom proc.
2015-09-24 01:12:38 +01:00
Razharas
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
Razharas
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
MMMiracles
3d43b8e389
dwarfdwarfdwarf
2015-09-23 18:13:16 -04:00
unknown
5a798a7210
cig lighting user feedback
2015-09-23 15:25:35 -06:00
unknown
e971423dc6
removed targetzone checks from smoking stuff
2015-09-23 15:16:11 -06:00
Razharas
e9bed91a1e
Merge pull request #11925 from Core0verload/matter-final
...
Materials - final solution
2015-09-23 21:11:17 +03:00
Xhuis
6711406d6a
Conflicts 2/3
2015-09-22 16:37:00 -04:00
Razharas
835da91620
Merge pull request #11883 from phil235/DnaMonkeyStuff
...
DNA rework
2015-09-22 18:43:27 +03:00
Xhuis
66f67946ae
Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff
2015-09-21 22:18:24 -04:00
phil235
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
