960f0b3129
adds in bluespace trashbag
2015-09-26 18:07:16 -04:00
6ca0a1ad40
Re-Adds Advanced Mop
2015-09-26 06:42:57 -04: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
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
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
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
2e8e8a15c7
Oops
2015-09-23 13:17:15 -05:00
b4eea5144b
Timer
2015-09-23 13:13:24 -05:00
e9bed91a1e
Merge pull request #11925 from Core0verload/matter-final
...
Materials - final solution
2015-09-23 21:11:17 +03:00
c11edd8418
Butcher update
2015-09-23 12:30:56 -05:00
0afa381114
Removes potential exploit
2015-09-22 20:12:14 -05:00
36ae116a48
Added another mode for smoothing (smooth with all subtypes).
2015-09-23 00:55:10 +01:00
05435d4ff7
Some code improvements
2015-09-22 17:24:59 -04:00
6711406d6a
Conflicts 2/3
2015-09-22 16:37:00 -04:00
fc073def62
Merge remote-tracking branch 'upstream/master' into smoothlattice
2015-09-22 19:40:01 +01:00
835da91620
Merge pull request #11883 from phil235/DnaMonkeyStuff
...
DNA rework
2015-09-22 18:43:27 +03:00
1484390e76
Removes extra bits
2015-09-22 06:05:17 -05:00
cce0bf2e9d
Meatspike
2015-09-22 05:33:02 -05:00
66f67946ae
Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff
2015-09-21 22:18:24 -04:00
4e1dda3da9
New tome sprite and some more work
2015-09-21 21:13:27 -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
Fox-McCloud
Razharas
KorPhaeron
Razharas
Cheridan
phil235
xxalpha
KorPhaeron
MMMiracles
unknown
Xhuis
phil235
c0
blah
Swag McYolosteinen