Commit Graph

11032 Commits

Author SHA1 Message Date
LetterJay
a97514965a Merge pull request #7124 from Citadel-Station-13/upstream-merge-38486
[MIRROR] Removes an unused open turf var
2018-06-18 09:50:35 -05:00
LetterJay
30bd4c5944 Merge pull request #7123 from Citadel-Station-13/upstream-merge-38482
[MIRROR] Add syndicate headset messages, squashes both together.
2018-06-18 09:43:56 -05:00
LetterJay
fc7f29c7bc Merge pull request #7131 from Citadel-Station-13/upstream-merge-38329
[MIRROR] [READY] [TESTED] Fusion Rework Episode V: The Phantom Fusion
2018-06-18 09:37:47 -05:00
LetterJay
98f6e8def0 Update randomverbs.dm 2018-06-16 16:47:19 -05:00
LetterJay
162b827033 Update topic.dm 2018-06-16 16:44:42 -05:00
LetterJay
68d33c79de Update admin_verbs.dm 2018-06-16 16:43:48 -05:00
LetterJay
7f6f8eb21f Update admin.dm 2018-06-16 16:43:23 -05:00
LetterJay
21af80d0d8 Merge pull request #7122 from Citadel-Station-13/upstream-merge-38493
[MIRROR] Corrects typos
2018-06-16 16:42:36 -05:00
LetterJay
5e25246058 Merge pull request #7120 from Citadel-Station-13/upstream-merge-38456
[MIRROR] Players who edited a circuit assembly can scan it as a ghost.
2018-06-16 16:41:15 -05:00
LetterJay
5ee2ee38b3 Revert "[MIRROR] Fixes chem heater trying to heat up empty beakers." 2018-06-16 16:18:50 -05:00
LetterJay
cc54931a66 Merge pull request #7096 from Citadel-Station-13/upstream-merge-38434
[MIRROR] Fixes chem heater trying to heat up empty beakers.
2018-06-16 16:18:42 -05:00
LetterJay
5cf9320999 Merge pull request #7117 from Citadel-Station-13/upstream-merge-38477
[MIRROR] [s] Prevent unbreakable ladders from being moved by shuttles
2018-06-16 16:17:45 -05:00
LetterJay
351f43a392 Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500
[MIRROR] Fixes attacking wooden walls
2018-06-16 16:17:28 -05:00
LetterJay
1a5021b9c5 Merge pull request #7112 from Citadel-Station-13/upstream-merge-38511
[MIRROR] Heating chems now mix at the right temps
2018-06-16 16:17:11 -05:00
LetterJay
c00f4f04d1 Merge pull request #7116 from Citadel-Station-13/upstream-merge-38489
[MIRROR] Some minor pubby shuttle tweaks
2018-06-16 16:16:36 -05:00
LetterJay
8bc19c89e6 Merge pull request #7115 from Citadel-Station-13/upstream-merge-38487
[MIRROR] Moves arch component application to where archdrops is defined
2018-06-16 16:16:19 -05:00
LetterJay
b349dbb619 Merge pull request #7114 from Citadel-Station-13/upstream-merge-38494
[MIRROR] Adds some signal helpers
2018-06-16 16:16:04 -05:00
cyclowns
a2f34faa55 [READY] [TESTED] Fusion Rework Episode V: The Phantom Fusion (#38329)
* initial iteration

* overlooks

* division -> multiplication

* less magic defines

* meant magic numbers, also BZ reqs -> N2O and plasma

* fusion now reacts to give higher temps

* iteration 2, thanks @Manybones

* small changes

* C O N S I S T E N C Y + more higher bigger temperatures

* testing shit and balance pass ignore this

* major balance pass, woohoo time for more TESTING

* whoops

* minor balancing

* radiation is more better

* desmos links..

* silly me

* more radiation buffs and remnants

* reverting a change i made at 2 am
2018-06-16 14:41:16 -05:00
Emmett Gaines
3e8168890f Removes an unused open turf var (#38486) 2018-06-16 06:19:37 -05:00
Jordan Brown
b4edde2c0a Add syndicate headset messages, squashes both together. 2018-06-16 06:19:29 -05:00
Jordan Brown
c25971d569 Merge pull request #38493 from ShizCalev/typo-fix
Corrects typos
2018-06-16 06:19:20 -05:00
Jordan Brown
3bee10c653 Merge pull request #38456 from theo2003/circuit_scan
Players who edited a circuit assembly can scan it as a ghost.
2018-06-16 06:18:46 -05:00
Tad Hardesty
a7b900425b [s] Prevent unbreakable ladders from being moved by shuttles (#38477)
* Prevent unbreakable ladders from being moved by shuttles

* Disconnect ladders before and reconnect them after shuttle move
2018-06-16 06:18:08 -05:00
Dax Dupont
e5b95cfcdd Some minor pubby shuttle tweaks (#38489)
* Some minor pubby shuttle tweaks

* no step

* Good idea denton

* thanks guys
2018-06-16 06:17:57 -05:00
Emmett Gaines
1f3bbebe0a Moves arch component application to where archdrops is defined (#38487) 2018-06-16 06:17:48 -05:00
Jordan Brown
8f2283c20e Adds some signal helpers (#38494) 2018-06-16 06:17:26 -05:00
AnturK
460bcd399d Fixes attacking wooden walls (#38500) 2018-06-16 06:17:10 -05:00
Armhulen
bf4be90f76 quickie fixies (#38511) 2018-06-16 06:16:56 -05:00
AnturK
09414f87d4 Fixes R&D display runtime (#38501) 2018-06-16 06:15:40 -05:00
CitadelStationBot
4780f3a20b [MIRROR] Add a missing space in mechacode (#7080)
* Merge pull request #38413 from Tlaltecuhtli/patch-45

Add a missing space in mechacode

* Add a missing space in mechacode
2018-06-15 02:50:06 -07:00
kevinz000
5ca76bc438 Update mobs.dm (#7109) 2018-06-15 02:49:28 -07:00
CitadelStationBot
773ba43974 [MIRROR] Fixes null bullets from being fired after they're deleted (#7102)
* Fixes null bullets from being fired after they're deleted (#38437)

* Adds handle_atom_del check to if deleted bullets are equal to ammo type and chambered round.

* works for me

* Update _box_magazine.dm

* Fixes null bullets from being fired after they're deleted
2018-06-15 02:48:48 -07:00
CitadelStationBot
95a9942bdc [MIRROR] Fixes cloning not working on those qdel'd but not yet destroyed by the garbage collector (#7105)
* Cloning deletion fix (#38438)

* Fixes cloning not working on those qdel'd but not yet destroyed by the garbage collector
2018-06-15 02:48:10 -07:00
CitadelStationBot
a8b5d744e8 [MIRROR] RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself (#7084)
* RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself

* Update life.dm
2018-06-15 02:47:52 -07:00
CitadelStationBot
f9d5987993 [MIRROR] [s]Diseases lose scan invisibility if their stealth drops below the threshold (#7082)
* Merge pull request #38415 from XDTM/master_of_disguise

[s]Diseases lose scan invisibility if their stealth drops below the threshold

* [s]Diseases lose scan invisibility if their stealth drops below the threshold
2018-06-15 02:47:11 -07:00
CitadelStationBot
eafb25535a [MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094)
* Adds a new drink: Peppermint Patty from Archer! (#38427)

* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too

* Adds a new drink: Peppermint Patty from Archer!
2018-06-15 02:46:40 -07:00
CitadelStationBot
727b1a1b14 [MIRROR] Fixes clothes getting damaged twice in explosions. (#7097)
* Fixes clothes getting damaged twice in explosions. (#38435)

* Fixes clothes getting damaged twice in explosions.
2018-06-15 02:44:01 -07:00
CitadelStationBot
f7924732c0 [MIRROR] Legacy config warning only happens if any legacy configs are present (#7089)
* Legacy config warning only happens if any legacy configs are present (#38421)

* Legacy config warning only happens if any legacy configs are present
2018-06-15 02:43:15 -07:00
CitadelStationBot
a3f8e18e26 [MIRROR] Androids are immune to radiation (#7091)
* Androids are immune to radiation (#38420)

* Androids are immune to radiation
2018-06-15 02:42:59 -07:00
CitadelStationBot
46b2bc0c63 [MIRROR] [s]Add pacifism checks for screwdriver/bottle attacks (#7092)
* Add pacifism check for screwdriver/bottle attacks (#38416)

* [s]Add pacifism checks for screwdriver/bottle attacks
2018-06-15 02:42:34 -07:00
CitadelStationBot
7ac96e2288 [MIRROR] Equalizes thresholds on being fat (#7095)
* Equalizes thresholds on being fat (#38383)

* Equalizes thresholds on being fat
2018-06-13 20:33:19 -07:00
CitadelStationBot
ae9c3f4b83 [MIRROR] You can see what other people eat or drink (#7101)
* You can see what other people eat or drink (#38395)

* Makes drinking message visible to others

* Makes swallow message visible to other people

* Adds visible messages for eating

* Update snacks.dm

* Update snacks.dm

* Update objs.dm

* Update drinkingglass.dm

* Update pen.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks.dm

* Update condiment.dm

* Update snacks.dm

* Adds a few extra reagents to the borg shaker

* Update drinkingglass.dm

* Update drinkingglass.dm

* removes blood as a borg shaker reagent

* You can see what other people eat or drink
2018-06-13 20:31:38 -07:00
CitadelStationBot
19f210f143 [MIRROR] Fixes flash_color (#7106)
* Fixes flash_color (#38430)

* Fixes flash_color

* Good question, i can't find a good answer so let's simplify this.

* Fixes flash_color
2018-06-13 20:26:24 -07:00
CitadelStationBot
d06df512d0 [MIRROR] [s] Fixes exploit where botany trays can be refilled at no cost. (#7081)
* [s] Fixes exploit where botany trays can be refilled at no cost.

* Merge pull request #38422 from DaxDupont/hydroponics

[s] Fixes exploit where botany trays can be refilled at no cost.
2018-06-13 20:25:08 -07:00
CitadelStationBot
0ab6db65a7 [MIRROR] BoH bombs now forcefully stun anyone flying when they go off (#7100)
* BoH bombs now forcefully stun anyone flying when they go off (#38397)

* Update bag_of_holding.dm

* Incorrect type.

* BoH bombs now forcefully stun anyone flying when they go off
2018-06-13 19:44:43 -07:00
CitadelStationBot
d875c362fa [MIRROR] Turf grammar omnibus (#7104)
* Turf grammar omnibus (#38375)

* Fix plurality and propriety on turfs

Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".

* Add an article var to handle unusual a/an

* An additional pass on turf names

* Decapitalize server, mainframe, killroom floors

* Turf grammar omnibus
2018-06-13 19:31:29 -07:00
CitadelStationBot
226780e0ed [MIRROR] Fixes vote ss trying to remove actions of people who already voted. (#7099)
* Fixes votes trying to remove actions of people who already voted. (#38431)

* Fixes vote ss trying to remove actions of people who already voted.
2018-06-13 19:30:14 -07:00
CitadelStationBot
8ec3ac03cd [MIRROR] Fixes drunken scientist R&D point gain. (#7098)
* Fixes drunken scientist R&D point gain. (#38432)

* Fixes drunken scientist point gain.

* Only R&D points

* Didn't mean to add this newline here.

* Fixes drunken scientist R&D point gain.
2018-06-13 19:28:35 -07:00
AnturK
549d6f0ab8 Fixes chem heater trying to heat up empty beakers. 2018-06-13 04:25:28 -05:00
CitadelStationBot
496a1d1165 [MIRROR] [s] Fixes sleeper logging. (#7085)
* Merge pull request #38429 from AnturK/runtimeA

[s] Fixes sleeper logging.

* [s] Fixes sleeper logging.
2018-06-12 17:23:37 -07:00