Commit Graph

2727 Commits

Author SHA1 Message Date
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
AnturK
94a5f4570a Fixes dumping from inside the lockers (#29896) 2017-08-17 18:57:30 +12:00
oranges
0bfe9b0de9 Merge pull request #29937 from ShizCalev/turret-fix
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
2017-08-17 10:49:24 +12:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
shizcalev
e61381cba6 Fixes MG exploit 2017-08-15 17:51:12 -04:00
Jordan Brown
dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Cyberboss
3981166635 Merge pull request #29861 2017-08-13 02:18:28 -04:00
shizcalev
a2e09babd1 Fixed Nanotrasen sign description 2017-08-12 13:34:42 -04:00
pubby
1b7797e690 Fix cracked fireaxe cabinet 2017-08-11 16:34:04 -05:00
pubby
4a6dac1f5e Updates PubbyStation (#29795)
Noteworthy changes:

move bar to where theater stage was (theater stage is kill)
expand kitchen into old bar area
add curator wing + curator job to monastery
enlarge chapel because curator wing too big
make foods not have random pixel_x/pixel_y at map load
Forgettable changes:

add augment manipulator to robotics
add toolbelts to tool storage
add crew monitor to brig
add droppers to chem
replace art storage wire with artistic toolboxes
add restroom sprites
improves floor decoration
recolor badly colored exp. lab pipe
correct misplaced pressure dial at incinerator
fix incorrect morgue access
fix stacked transit tubes
add workout machines to brig
add cable layer to engineering
change dorms slightly
replace gaudy SS13 sign with gaudy Nanotrasen sign
add SS13 floor sign
chapel now has bees
2017-08-10 08:18:55 -03:00
ShizCalev
922422a159 Window Spawners mk2 (#29792) 2017-08-10 08:17:30 -03:00
shizcalev
22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
AnturK
d1bb1686cb Fixes showers breaking lighting objects. (#29706) 2017-08-05 09:43:00 -03:00
Cyberboss
7e6c1198e9 Merge pull request #29695 2017-08-04 10:21:47 -04:00
FrozenGuy5
76ee209a6c flora initialize poo 2017-08-03 22:16:49 +03:00
Lzimann
97199dd8b0 Gives an initialize hint to stacks, boxes, closets and bots 2017-08-03 15:30:00 -03:00
Jordan Brown
3ec4aec215 Merge pull request #29601 2017-08-01 09:37:28 -04:00
shizcalev
99624b8e74 further spellchecking 2017-07-31 23:09:08 -04:00
Fox-McCloud
29f1779885 Improves several Sound Loops' Performance 2017-07-30 12:23:37 -04:00
Cyberboss
5b3b39cdd3 Merge pull request #29543 2017-07-29 20:41:11 -04:00
ShizCalev
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
pubby
8e8ca692a5 Updates PubbyStation
- makes layout more public
- adds monastery transit tube
- aux mining base is now in engineering maint.
- and more!
2017-07-27 20:35:49 -05:00
Jordan Brown
f4e1be467c Merge pull request #29502 2017-07-27 09:43:16 -04:00
shizcalev
8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04:00
Joan Lung
6d7e3f2281 Lava is no longer a plating subtype (#29463) 2017-07-25 22:16:02 -03:00
oranges
b44bb6ffad Revert "Adds the hivebot invasion event (#28514)"
This reverts commit 78a2e5c4c3.
2017-07-25 23:06:38 +00:00
Jordan Brown
26f16d2222 Merge pull request #29476 2017-07-25 16:19:41 -04:00
kevinz000
75d9f8e3fc Update musician.dm 2017-07-25 04:44:56 -07:00
oranges
ab940008b8 Merge pull request #29454 from ShizCalev/nanotrasen
Standardized the corporate name
2017-07-25 09:34:20 +12:00
kevinz000
9e4681fdd8 Update musician.dm 2017-07-24 00:25:07 -07:00
kevinz000
d9a057966d Update musician.dm 2017-07-24 00:13:10 -07:00
kevinz000
abeda8d408 Update musician.dm 2017-07-23 23:03:53 -07:00
kevinz000
bb37810a4a Instrument performance update (#29395)
Scans for hearers every 4 ticks instead of per note.
2017-07-24 10:20:13 +12:00
shizcalev
f31cbb3ac5 Nanotrasen 2017-07-23 04:08:57 -04:00
kevinz000
e99d100c35 Fixes shower runtimes (#29389)
* Update watercloset.dm

* Update watercloset.dm

* Update watercloset.dm
2017-07-22 20:48:38 +02:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Joan Lung
ca06bc22e6 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232) 2017-07-17 12:25:01 -03:00
Leo
e5fb32e96b Merge pull request #29274 from kevinz000/patch-254
Minor instrument code cleanup
2017-07-17 09:14:31 -03:00
kevinz000
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
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
Jordan Brown
bf4373958e Merge pull request #29233 from optimumtact/bumped
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
ShizCalev
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
kevinz000
b3e62c530a Update musician.dm 2017-07-14 18:09:48 -07:00
oranges
e04fd83b9d Rename Bumped to CollidedWith
In light of the change of Bump to Collide, this should also be done
as it will make it less confusing for devs in the future

I also ended up changing a bunch of the code in the CollidedWith procs,
things that were assuming types, doing bad loc changes and so forth
2017-07-15 00:25:22 +00:00
kevinz000
e461c3add5 Makes showers clean WASHABLE_COLOUR_PRIORITY (#29170)
Makes showers clean WASHABLE_COLOUR_PRIORITY
2017-07-14 11:39:20 -04:00
AnturK
d3bcb4cbf9 Removes old height parameter from CanPass proc (#29218) 2017-07-13 08:57:25 -03:00
kevinz000
876bc2d92d Adds a "synthesizer" that's basically a handheld piano (#29197)
* Update instruments.dm

* Update personal.dm

* Update personal.dm

* nicbn sprites

* icon pathing
2017-07-12 23:24:09 -04:00
Leo
9171a94566 Merge pull request #29196 from kevinz000/patch-249
Raises max lines for piano from 50 to 300
2017-07-12 14:59:33 -03:00
Jordan Brown
78a2e5c4c3 Adds the hivebot invasion event (#28514)
Follow up to #23398

Xhuis & Cyberboss
add: New hivebot invasion event
2017-07-12 13:09:06 +12:00