fdc0eadfbd
Adds package-lock as requested by Cyberboss ( #38516 )
2018-06-16 06:18:26 -05:00
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
5ca76bc438
Update mobs.dm ( #7109 )
2018-06-15 02:49:28 -07:00
7525124e89
Automatic changelog generation for PR #7102 [ci skip]
2018-06-15 04:48:51 -05:00
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
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
55628dca90
Automatic changelog generation for PR #7084 [ci skip]
2018-06-15 04:47:54 -05:00
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
6fee75e485
Automatic changelog generation for PR #7082 [ci skip]
2018-06-15 04:47:14 -05:00
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
457fe03ec3
Automatic changelog generation for PR #7094 [ci skip]
2018-06-15 04:46:42 -05:00
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
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
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
e9abd23576
Automatic changelog generation for PR #7091 [ci skip]
2018-06-15 04:43:01 -05:00
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
b42cf51f15
Automatic changelog generation for PR #7092 [ci skip]
2018-06-15 04:42:37 -05:00
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
70262537c2
[MIRROR] Updates travis' minor byond version ( #7107 )
...
* Updates travis' minor byond version (#38460 )
* Updates travis' minor byond version
2018-06-15 02:41:54 -07:00
011d5691ed
Ninja Holding Area Change ( #7088 )
...
bathroom's turfs changed from /turf/.../plasteel/airless/white to
/turf/.../plasteel/white like they should be
2018-06-14 09:57:01 -07:00
645eb08857
Merge pull request #7075 from Citadel-Station-13/upstream-merge-38325
...
[MIRROR] Adds SQL to travis. Other travis optimizations
2018-06-14 09:13:18 +00:00
69e6b0e4c6
Automatic changelog generation for PR #7095 [ci skip]
2018-06-13 22:33:21 -05:00
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
378d474f83
Automatic changelog generation for PR #7101 [ci skip]
2018-06-13 22:31:40 -05:00
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
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
304bc836cc
Automatic changelog generation for PR #7081 [ci skip]
2018-06-13 22:25:11 -05:00
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
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
237cc0dabd
Automatic changelog generation for PR #7104 [ci skip]
2018-06-13 21:31:31 -05:00
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
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
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
901dd94253
Corrects climax cooldown timer message, makes relieve message pronounsensitive ( #7086 )
2018-06-13 19:27:19 -07:00
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
7881c24f29
Update .travis.yml
2018-06-12 08:10:12 -05:00
602f52f423
Automatic changelog generation for PR #7073 [ci skip]
2018-06-12 08:09:23 -05:00
64d5c8cbdc
Merge pull request #7073 from Citadel-Station-13/upstream-merge-38381
...
[MIRROR] Fix legion cores not healing confusion
2018-06-12 08:09:20 -05:00
8b65c88f64
Merge pull request #7077 from Citadel-Station-13/upstream-merge-38404
...
[MIRROR] Fixes unintentional vehicle buff
2018-06-12 08:08:51 -05:00
d4684b5204
Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424
...
[MIRROR] Removes doubled iaa definition.
2018-06-12 08:08:39 -05:00
e01c027366
Automatic changelog generation for PR #7072 [ci skip]
2018-06-12 08:08:17 -05:00
14f7ca0449
Merge pull request #7072 from Citadel-Station-13/upstream-merge-38376
...
[MIRROR] [s] Fix lockboxes not actually being locked
2018-06-12 08:08:15 -05:00
3a29c8bbfd
Automatic changelog generation for PR #7070 [ci skip]
2018-06-12 08:03:42 -05:00
2c0a82ec50
Merge pull request #7070 from Citadel-Station-13/upstream-merge-38378
...
[MIRROR] Fix deaf people hearing borg modules going offline
2018-06-12 08:03:40 -05:00
20d0b78ef7
Automatic changelog generation for PR #7069 [ci skip]
2018-06-12 07:59:23 -05:00
49cdba9f90
Merge pull request #7069 from Citadel-Station-13/upstream-merge-38380
...
[MIRROR] Give plasmamen their plasma suits in VR
2018-06-12 07:59:20 -05:00
ac078c4789
Merge pull request #7068 from Citadel-Station-13/upstream-merge-38382
...
[MIRROR] Make chat squashing HTML-agnostic II
2018-06-12 07:58:55 -05:00
87cc0e6c6f
Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360
...
[MIRROR] Cleans up some logging
2018-06-12 07:41:10 -05:00
b70ed7cd11
Automatic changelog generation for PR #7066 [ci skip]
2018-06-12 07:38:15 -05:00
e20db49269
Merge pull request #7066 from Citadel-Station-13/upstream-merge-38366
...
[MIRROR] Replace area-wide fire overlay with reddening the lights
2018-06-12 07:38:13 -05:00
Dax Dupont