Commit Graph

6358 Commits

Author SHA1 Message Date
anconfuzedrock
c4125d88bf anyone want to play some board game online (#25558) 2017-03-31 08:31:49 +02:00
Cyberboss
5646c736c8 Merge upstream 2017-03-30 19:18:59 -04:00
Cheridan
9ffce1f73b Merge pull request #25557 from KorPhaeron/robott
Fixes Robot Overlays
2017-03-29 16:11:20 -05:00
kevinz000
465f136b96 [READY]Planetstation: Floodlights (#25310)
* floodlights

* floodlights

* ...

* copypasta

* traviscaughtmenottesting

* fixes

* set_light

* fixed

* construction

* strings

* kay

* Update floodlight.dm

* Update floodlight.dm
2017-03-29 18:09:33 +13:00
KorPhaeron
37325ccbe9 Robot Overlays 2017-03-27 19:52:10 -05:00
Cyberboss
05e1ef69e1 Merge upstream 2017-03-27 09:32:08 -04:00
Robustin
5fb208957a Merge branch 'master' of https://github.com/tgstation/tgstation into AHHHHHHHHHHHHH 2017-03-26 12:15:15 -04:00
coiax
4c66182ff0 CTF teams have their own radio channels + fixes (#25456) 2017-03-25 19:53:03 -03:00
Leo
005f8f1889 Fixes sheets runtiming on ORM (#25464) 2017-03-25 15:29:09 -04:00
kevinz000
1e482f3907 Flashbangs no longer work on the dead (#25442) 2017-03-25 10:05:19 -03:00
GunHog
ac4d69254b Revival of "Allows AIs to deploy to borgs" by Shadowlight213 (#25184)
The AI may now deploy to cyborgs prepared as AI shells. The module to do this may be research in the exosuit fabricator. Simply slot the module into a completed cyborg frame as with an MMI, or into a playerless (with no ckey) cyborg.
2017-03-24 21:42:48 -03:00
Cyberboss
cd050a38f0 Merge branch 'master' of https://github.com/tgstation/tgstation into TiredOfTheInconsistency 2017-03-24 16:34:20 -04:00
Iamgoofball
361d4f7547 Removes the undertale skeleton toy (#25422)
* GOOFBALL'S OUTDATED MEME PURGE #2: Undertale

🆑 GOOFBALL'S OUTDATED MEME PURGE
fix: Remember when undertale was the popular meme with le Sans and le Paprika and le doggos? xddddDDDDDDD
fix: Removes their shitty meme toy that no one uses. Again.
/🆑

* Update arcade.dm

* Delete papyrus_1.ogg

* Delete papyrus_10.ogg

* Delete papyrus_2.ogg

* Delete papyrus_3.ogg

* Delete papyrus_4.ogg

* Delete papyrus_5.ogg

* Delete papyrus_6.ogg

* Delete papyrus_7.ogg

* Delete papyrus_8.ogg

* Delete papyrus_9.ogg

* Delete sans_1.ogg

* Delete sans_10.ogg

* Delete sans_2.ogg

* Delete sans_3.ogg

* Delete sans_4.ogg

* Delete sans_5.ogg

* Delete sans_6.ogg

* Delete sans_7.ogg

* Delete sans_8.ogg

* Delete sans_9.ogg

* Update organ_internal.dm

* Update packs.dm
2017-03-25 09:16:20 +13:00
Leo
6696dd9512 Merge pull request #25413 from Cyberboss/patch-4
Fixes removing PDA pens from storage
2017-03-24 11:20:39 -03:00
coiax
a31ad34b81 Explosive implant action button can always be activated (#25389) 2017-03-23 20:41:11 -03:00
bgobandit
019b4e458b Makes changes oranges requested in the PR but merged anyway because what the fuck is the value of my free time (#25387)
* Makes changes requested in PR

* fuckity fuck fuck FUCK fuck you fuck die fuck

*Swampbandit
2017-03-24 09:26:48 +13:00
Cyberboss
afa6e987e9 Fixes #25328 2017-03-23 10:39:56 -04:00
Cyberboss
db99403313 Merge branch 'master' into TiredOfTheInconsistency 2017-03-23 09:21:20 -04:00
Cheridan
d632aa2d35 Merge pull request #25378 from lzimann/smite
Replaces BSA with smite and adds BSA to smite
2017-03-23 02:12:05 -05:00
AnturK
de9dd1d11a Simple jammer buff (#25364) 2017-03-22 19:37:42 -03:00
XDTM
e49f236457 Raises the medical gauze's max stack size to 12 (#25366) 2017-03-22 19:30:32 -03:00
Cyberboss
d0bfbc3e13 Rename ticker to SSticker 2017-03-22 10:48:25 -04:00
oranges
5adafabb1f Merge pull request #25318 from bgobandit/tetrismustdie
Alt-clicking a command headset toggles HIGH VOLUME mode.
2017-03-22 22:19:41 +13:00
Lzimann
77122af265 Replaces BSA with smite and adds BSA to smite 2017-03-21 23:23:08 -03:00
bgobandit
560db095df Alt-clicking a command headset toggles HIGH VOLUME mode. 2017-03-20 11:55:21 -04:00
Leo
4c1d9131a3 Merge pull request #25268 from octareenroon91/patch-40
Fix synthetic arm blade origin_tech
2017-03-19 23:43:57 -03:00
Leo
c7da35d9d5 Ports stacks and sheets to initialize (#25224) 2017-03-19 15:54:26 +01:00
kevinz000
118e851ca4 prevents people from abusing pai panels by keeping them open (#25227) 2017-03-19 10:20:55 -03:00
octareenroon91
67be18012b Fix synthetic arm blade origin_tech 2017-03-18 21:38:53 -05:00
Robustin
e7142ba428 Construction Nuke and Dance Machine 2017-03-18 16:14:08 -04:00
Leo
eaab4f5012 Merge pull request #25206 from octareenroon91/patch-39
Fix ecig chem consumption
2017-03-18 15:26:02 -03:00
Cheridan
46da9d2b81 Merge pull request #25011 from PKPenguin321/flashdark
Adds flashdarks
2017-03-17 17:09:27 -05:00
octareenroon91
6384b1a240 Update cigs_lighters.dm
Cause cigs/ecigs to consume chemicals whether or not the owner can absorb them.
2017-03-17 12:08:48 -05:00
Iamgoofball
099c822b7c RCD refactor (#25154)
* Refactors RCD code
2017-03-17 00:22:22 -03:00
Joan Lung
5917e1ffae You can now place lights on shuttles (#25142)
* You can now place lights on shuttles

* apcs don't go there

* this should really be a proper decon
2017-03-16 19:18:25 -05:00
Joan Lung
0cf2e02bb6 Red and green energy swords have much less saturated light colors (#25118) 2017-03-16 20:25:51 +13:00
octareenroon91
c4d42e8a8a Allow reflector construction (#25084)
New reflector frames can now be built at will.
2017-03-14 20:46:56 -04:00
Cheridan
856583d6c5 Merge pull request #24989 from jughu/honeybum<3
Lets you carry honey in plant bags
2017-03-13 14:33:29 -05:00
Cyberboss
012eaec1b9 Mob Initialization (#24840)
* Mob Initialization

* new_player Repath

* Fix the dme

* Fix the shit

* Fix a loc

* Fix another loc

* But, in my haste, I forgot the cola!

* Another loc

* ANOTHER LOC

* Further docs

* Where'd that s come from

* Fix shit

* Better
2017-03-13 20:21:12 +01:00
coiax
cb38468e0c Merges HEADBANGPROTECT and EARBANGPROTECT into new secondary flag (#24881)
Unless we get a clothing item that can be worn on the head, and the
ears, and only protects from loud noises in one of the configurations,
this isn't going to be an issue.

Frees up another flag slot, all hail the secondary flags.
2017-03-13 22:00:43 +13:00
coiax
f1d1e6f5e9 Demotes HANDSLOW to secondary flag (#24878)
It's used in literally four places, it doesn't need a high speed
bitflag slot.
2017-03-13 21:59:48 +13:00
coiax
abdbf9e4c5 Adds cyan glowsticks (#25015)
🆑 coiax
add: Glowsticks can now be found in "Swarmer Cyan" colors.
/🆑

because apparently adding the colour cyan to swarmers was too potential
to cause meta or some shit idk
2017-03-13 03:26:04 -04:00
AnturK
e5b964f11e Fixes stack splitting (#24941)
* Fixes stack splitting

* Integrates other bugfix in this
2017-03-13 11:34:15 +13:00
AnturK
f85ce64bf1 Updates jammer (#24975) 2017-03-12 16:13:35 -04:00
Mike Long
f36feb87b5 Lordpidey devil fixes (#24693)
* Devils made via event can no longer ascend.

Admins can control whether or not a devil may ascend via traitor panel.

* Adds logging

* Fixes #21326,     Fixes #21321

* Fixes compile error, removes dead code.

* Moves logging to where it's supposed to be.

* Arch devils can now destroy walls with pitchfork.

* Fixes compile error.

* Summon dancefloor can't be used to break down walls.

* Improves disco floor wall check

* Fixes traitor panel for devils.

* refactors human attack_hand

* Fixes compile error

* Devils now respawn with clothes.
2017-03-12 20:55:36 +01:00
PKPenguin321
72571786f1 adjusts darklight range/power values 2017-03-11 18:22:34 -08:00
PKPenguin321
0cb1d0e7a8 Adds flashdarks
- Tweaks lightlight code to make light power a var
- Adds code and sprites for flashdarks
2017-03-11 17:15:54 -08:00
jughu
03886f7d43 Update bags.dm 2017-03-11 18:00:04 +01:00
Lexorion
e5e4101f45 gives the bag of holding unique inhands (#24985)
* gives the bag of holding unique inhands

* improves south sprite
2017-03-11 11:17:57 -05:00
Cheridan
4418958f94 Merge pull request #24911 from Supermichael777/Box-meme
Removes the singularity beacon kit from the traitor bundle list.
2017-03-11 02:51:12 -06:00