a2dc6e2c5a
Merge pull request #29724
2017-08-06 18:58:26 -04:00
f65786a8cf
The inhands of the Dark Blessing chaplain weapon is now visible. ( #29727 )
2017-08-05 11:02:21 -03:00
552b851445
Update light.dm
2017-08-05 01:45:27 +01:00
fc0a102753
Merge pull request #29693
2017-08-04 10:21:07 -04:00
6b6fc91172
Merge pull request #29623 from Cyberboss/TiredOfBS
...
Removes all checks for subsystem existence
2017-08-04 23:54:47 +12:00
97199dd8b0
Gives an initialize hint to stacks, boxes, closets and bots
2017-08-03 15:30:00 -03:00
6806607425
Merge pull request #29369
2017-08-02 09:45:05 -04:00
d3a4468ede
Fixes devil pitchforks being uninitialized ( #29610 )
2017-08-01 17:57:15 -05:00
6175ab77d5
Removes all checks for subsystem existence
2017-08-01 10:16:37 -04:00
6df66f730f
Merge pull request #29617
2017-08-01 09:40:33 -04:00
99624b8e74
further spellchecking
2017-07-31 23:09:08 -04:00
d4966faf23
removes ERP material
2017-07-31 21:48:50 -04:00
8032eeab74
Merge pull request #29558
2017-07-29 20:41:00 -04:00
d525b18d8d
Completes major inhand split project ( #29574 )
...
* Completes split project
* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
2efdc78681
this fixes the PR
2017-07-29 03:52:55 +02:00
7ecbb8a1b2
Merge branch 'master' into disgustport
2017-07-29 03:06:25 +02:00
fb314c525b
Give c4 correct plastic_overlay
...
Fixes #19270
2017-07-28 15:46:49 -05:00
899bb2a305
Ports Rapid Cable Layers from /vg/ and paradise ( #29119 )
...
Add's a tool that lays cable as you walk , speeding up cable construction
add: Nanotrasen has begun production of the Rapid Cable Layer, a tool that helps you lay down cables faster
add: You can now craft ghetto RCLs with metal, a screwdriver, welder, and wrench. They hold less cable, and may fall apart or jam!
2017-07-28 09:58:40 +12:00
12620b6bb3
Merge pull request #29518
2017-07-27 09:45:47 -04:00
f4e1be467c
Merge pull request #29502
2017-07-27 09:43:16 -04:00
ef251fc3a7
might be better to use total worth instead
2017-07-26 14:37:48 -04:00
0fb80e97b3
fixes a couple issues
2017-07-26 14:38:44 -04:00
8ebf6b6a43
cleaned up paper
2017-07-26 05:35:05 -04:00
b44bb6ffad
Revert "Adds the hivebot invasion event ( #28514 )"
...
This reverts commit 78a2e5c4c3
2017-07-25 23:06:38 +00:00
ab940008b8
Merge pull request #29454 from ShizCalev/nanotrasen
...
Standardized the corporate name
2017-07-25 09:34:20 +12:00
a5e7d63cb2
Unborks supermatter theft ( #29432 )
2017-07-24 09:51:04 +02:00
90689ebba1
Merge pull request #29163 from Tacolizard/jim_E_Rustle
...
Prevents the captain's sabre from rustling jimmies
2017-07-24 11:12:42 +12:00
63c5f67dd1
Merge pull request #29431 from Xhuis/sorry_about_that_ii_screwed_it_up
...
Nuke screwdrivers are no longer randomly colored
2017-07-24 10:35:43 +12:00
f31cbb3ac5
Nanotrasen
2017-07-23 04:08:57 -04:00
a5f4e6c124
Nuke screwdrivers are no longer randomly colored
2017-07-21 21:16:54 -04:00
9123f45eab
Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.) ( #29393 )
2017-07-21 20:25:19 -03:00
e677813a93
Merge pull request #29401 from Xhuis/satchel_fix
...
Ore satchels no longer have infinite capacity
2017-07-21 20:20:41 -03:00
01d9da3da4
Fixes a drone ping issue
2017-07-20 18:16:18 -04:00
a3178652d6
Ore satchels no longer have infinite capacity
2017-07-20 12:37:26 -04:00
fedf7ba7fd
pleases the gods
2017-07-20 17:10:16 +02:00
c48bd7ca08
Adds investigate logs to portals ( #29334 )
...
* Update teleportation.dm
* Update admin_investigate.dm
* Update logging.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
2017-07-20 08:57:46 -04:00
2438bd2aa8
Small belt overlay rewrite, and tool overlays for toolbelts ( #29180 )
...
* Belt overlay tweaks, tool overlays
* Belt overlays now have their own file
* work on porting to the new screwy looks
* Work on screwdrivers
* Fixes screwdrivers
* really SCREWED that one up!
2017-07-19 15:29:35 +01:00
e39d5d871f
me making this port work https://www.oranges.net.nz/~oranges/webm/stuck_pancake.webm
2017-07-19 11:43:55 +02:00
2312ff09be
Fixing conflicts
2017-07-19 11:19:52 +02:00
9f2684af41
Merge pull request #29320 from Xhuis/electric_guitar_fix
...
Electric guitars now properly use .ogg sound files
2017-07-18 14:50:25 -04:00
45d3d52af7
Made some object lists less terrible to read ( #29304 )
...
* spaces
* more spaces
* last ones
2017-07-18 10:44:29 -04:00
fea979b46a
Merge pull request #29303 from kevinz000/patch-255
...
Fixes flashbang stun times
2017-07-17 22:13:46 -03:00
30e5070792
Fixes electric guitars
2017-07-17 13:09:50 -04:00
ca06bc22e6
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #29232 )
2017-07-17 12:25:01 -03:00
de3f268385
Merge pull request #29262 from ChangelingRain/rpdtweak
...
RPDs can now place disposals pipes on dense non-wall turfs
2017-07-16 12:50:05 -04:00
0833a9002f
Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. ( #29277 )
...
* multiext
* instruments
* kekkles
* clown
* Update instruments.dm
* Update packs.dm
* Update packs.dm
* Update instruments.dm
* Update action.dm
* typo
* Update instruments.dm
2017-07-16 12:48:51 -04:00
ca59ca6c23
Changes all access const to be a define ( #29260 )
2017-07-16 18:44:23 +02:00
ce1568190b
Update flashbang.dm
2017-07-16 06:01:44 -07:00
bf4373958e
Merge pull request #29233 from optimumtact/bumped
...
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
db10f35703
Cleaned up some emag_acts ( #29238 )
...
* cleaned up some emag_acts
* Randomized spark sounds
* Made sparky looking things sound sparky too
* early return
2017-07-15 11:27:50 -04:00
Cyberboss
Firecage
FrozenGuy5
oranges
Lzimann
shizcalev
MoreRobustThanYou
ShizCalev
Unknown
octareenroon91
BeeSting12
Ashe Higgs
kevinz000
Joan Lung