Commit Graph

7469 Commits

Author SHA1 Message Date
Cheridan
4df060ccc2 Merge pull request #16700 from Bawhoppen/smallspawnerchanges
Removes salt-shaker from maint loot
2016-04-21 00:28:06 -05:00
Cheridan
6f1ba9a669 Merge pull request #17008 from ChangelingRain/shivertile
Floor tiles have slightly random placement
2016-04-20 22:42:11 -05:00
Cheridan
fb02af044a Merge pull request #16995 from ChangelingRain/thisiswhathappenswhenyoumergewithoutanyonecheckingmyworkkor
Fixes cyborg screwdriver and wirecutters having no icon
2016-04-20 18:03:30 -05:00
Cheridan
ec001cf1d9 Merge pull request #16952 from Core0verload/meme-out
i was the antiskub all along
2016-04-20 17:56:59 -05:00
Cheridan
c53887e4c1 Merge pull request #16987 from ChangelingRain/overlay
Makes a few things use temporary overlays
2016-04-20 12:11:58 -05:00
Nerd Lord
30c5fc412c Floor tiles have slightly random placement 2016-04-19 23:28:49 -04:00
Nerd Lord
fb274886f9 regardless of what you do this is disgusting 2016-04-19 15:44:30 -04:00
Nerd Lord
fd243de33d kor's fault 2016-04-19 15:40:02 -04:00
duncathan salt
b85e10f00a Merge pull request #16929 from kevinz000/safegriefing
Admin Detection Multitool
2016-04-19 08:52:36 -06:00
Nerd Lord
ff44a04f3b Makes a few things use the temporary overlays instead of doing stuff manually 2016-04-19 10:28:40 -04:00
c0
c9926867d1 Final Solution for one shitty meme 2016-04-19 11:02:56 +03:00
kevinz000
e446c5b411 Definesarenice 2016-04-18 23:40:30 -07:00
KorPhaeron
6c91bc15d3 Merge pull request #16943 from ChangelingRain/colorfulcarp
Charger holocarp will now color the trail properly
2016-04-18 18:36:20 -05:00
Cheridan
aa48717c29 Merge pull request #16972 from ChangelingRain/cratefailure
You can actually place items in crates now
2016-04-18 18:34:17 -05:00
Nerd Lord
9bd1d57061 You can actually place items in crates now 2016-04-18 19:21:02 -04:00
Jack Edge
a5600abd26 Use drone dufflebag sprites 2016-04-19 00:03:24 +01:00
Nerd Lord
c06c81a3a6 fuck sprite conflicts 2016-04-18 16:30:07 -04:00
Nerd Lord
bab446dcd2 New tool inhand sprites 2016-04-18 16:15:23 -04:00
Cheridan
abb48c84eb Merge pull request #16920 from PKPenguin321/patch-5
[s] FUCKING GHOST FAGS
2016-04-18 14:27:18 -05:00
Cheridan
c43d69bd0c Merge pull request #16919 from ChangelingRain/voicefromthecrate-r
You can now climb onto crates
2016-04-18 14:12:54 -05:00
Cheridan
d671bf573c Merge pull request #16858 from nullbear/Chemical-Explosives
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
Cheridan
e7f7704099 Merge pull request #16921 from RandomMarine/theclothening
Biogenerated cloth stacks.
2016-04-18 02:27:36 -05:00
Cheridan
842d50cef2 Merge pull request #16831 from zenek123/master
Makes vodka able to clean floors
2016-04-18 02:06:54 -05:00
kevinz000
6bd271b299 Itried 2016-04-17 20:26:55 -07:00
Nerd Lord
88110f726d Charger holocarp will now color the trail properly 2016-04-17 19:06:02 -04:00
PKPenguin321
c6b9b620fb istype(user)
i hope i did that right
2016-04-17 15:15:52 -07:00
Joan Lung
a88f498701 Merge pull request #16918 from coiax/drone-duffles
Drones start with preloaded engineering dufflebags
2016-04-17 15:49:57 -04:00
coiax
884d85e519 Adjusted dufflebag contents 2016-04-17 20:21:23 +01:00
Joan Lung
d1e90e4dc6 Merge pull request #16915 from coiax/holodeck-chairs
Wooden holodeck chairs can no longer be picked up
2016-04-17 11:56:29 -04:00
Cheridan
d682fccd14 Merge pull request #16901 from nullbear/monkey-cube-fix
Fixes monkey cube Dupe Glitch
2016-04-17 09:21:48 -05:00
Jack Edge
336612f663 You can't pick up NODECONSTRUCTed chairs 2016-04-17 14:39:42 +01:00
kevinz000
815807ae20 Lessens search range as it doesn't need to look in the entire world 2016-04-17 01:10:37 -07:00
Joan Lung
6c16bc874a Merge pull request #16843 from PKPenguin321/krow-macaw
Adds Krav Maga
2016-04-17 00:02:48 -04:00
PKPenguin321
ac3e7e18dd final style changes 2016-04-16 20:30:18 -07:00
kevinz000
715d4b22b9 Revert "Revert "Admin Detection Multitool""
This reverts commit 7dc3e70f1e.
2016-04-16 20:08:36 -07:00
kevinz000
7dc3e70f1e Revert "Admin Detection Multitool"
This reverts commit 2e49750322.
2016-04-16 20:07:59 -07:00
kevinz000
2e49750322 Admin Detection Multitool
Allows for griefing to be done in safety :^)
2016-04-16 20:07:42 -07:00
RandomMarine
76212a5fb9 Implements cloth stacks 2016-04-16 12:56:37 -07:00
RandomMarine
82e39d6a85 Implements cloth stacks 2016-04-16 11:11:16 -07:00
PKPenguin321
e5a9920874 fixes ghost fire extinguishers FOR REAL 2016-04-16 10:58:30 -07:00
Jack Edge
db5f08adf0 Fixed indentation issues 2016-04-16 18:29:44 +01:00
Nerd Lord
0e43fa3344 la anchored mob meme 2016-04-16 13:26:24 -04:00
Nerd Lord
f073b3508b butterflies don't lie, so you can't stuff them into crates?
that's dumb, let's fix it
2016-04-16 13:15:25 -04:00
Nerd Lord
1b28d1ccf7 this is a better check 2016-04-16 13:14:06 -04:00
Jack Edge
683aa9b26f Drones start with preloaded engineering dufflebags
🆑 coiax
rscadd: Drones now start with a spacious dufflebag full of tools, so they will stop stealing the captain's
/🆑
2016-04-16 18:09:28 +01:00
Nerd Lord
97a5a4cb9f crate climbing 2016-04-16 13:05:15 -04:00
nullbear
1cb85c3024 Fixes monkey cube Dupe Glitch
fixes https://github.com/tgstation/-tg-station/issues/14667

Adds some consistency, allowing monkeys to be drag dropped onto the
monkey recycler, like they are with the disposals chutes.

Prevents grabs from being placed in disposals, as they were being
before.
2016-04-15 21:36:34 -07:00
Incoming
22c9a1e14d Removes the blatantly copyrighted sans and papyrus action figures and the blatantly copyrighted sounds attached to them.
As a bonus this also makes the project work in the stable 509 build again.

@ChangelingRain NO.
2016-04-16 00:19:35 -04:00
Joan Lung
262c0688de Merge pull request #16845 from Shadowlight213/Bluemag
Adds bluespace emag as a badmin item
2016-04-15 20:26:02 -04:00
PKPenguin321
2ecb556e94 addresses minor feedback, fixes implant
krav maga implant now works 100%
trailing returns and a useless if() removed
2016-04-14 22:49:29 -07:00