92523c03f2
Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo
...
Sleeping Carp changes
2015-10-07 22:25:11 +03:00
38f5c0c85a
Merge pull request #12122 from Steelpoint/Magazine
...
[MAP] Continuation Of Armoury Map PR + Magazine Removal
2015-10-07 15:13:15 +02:00
7242d12cb0
Merge pull request #12159 from Aranclanos/tanksuicide
...
Changes the tank suicide act to bruteloss instead of gibbing.
2015-10-06 21:52:49 +03:00
9b710d7fcb
Merge pull request #12153 from duncathan/destroyfixes
...
Destroy() fixes
2015-10-06 09:27:41 +03:00
87c9960d6c
Merge pull request #12102 from bgobandit/singlotips
...
FIXES SINGULARITY BEACON AND POWERSINK TEXT, IT WORKS, I DON'T CARE, FUCK
2015-10-05 22:16:00 +03:00
4d03f22943
Changes the tank suicide act to bruteloss instead of gibbing.
2015-10-04 20:16:39 -03:00
4475824890
fixes #12143
2015-10-04 07:33:32 -06:00
1211ec4102
Some gang stuff
2015-10-04 00:26:26 -04:00
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
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
207f6a6048
Merge pull request #12108 from Jordie0608/tilessolightyoucantevenseethem
...
Fixes #11268 , iconless wired glass tiles
2015-10-03 09:24:07 -05:00
b5ded1c9e8
InitalCommit
2015-10-03 21:22:29 +08:00
c6627b3d70
Fixes iconless wired glass tiles
2015-10-02 21:28:19 +10:00
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
6c303a37cd
THIS FUCKING SHIT RIGHT HERE FUCK
2015-10-01 23:12:40 -04:00
54d9e6924d
Merge pull request #11868 from bgobandit/diditallforthelewdbe
...
Adds kitty mousey toys!
2015-10-01 05:06:34 +03:00
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
26b8112dea
Adds additional items to the storage of many coats and oversuits.
2015-09-29 22:29:07 -04: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
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
Razharas
Swag McYolosteinen
Aranclanos
duncathan
Xhuis
Cheridan
Steelpoint
Jordie
bgobandit
Marc R. Uchniat
Fox-McCloud
phil235
bustygoku
bustygoku
c0
Razharas
phil235
xxalpha