shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,839 Commits 5 Branches 0 Tags
6b42e20e2abdb74ab3ef570f5f5c7fd826b9f320
Commit Graph
11138 Commits
Author SHA1 Message Date
Tad Hardestyandletterjay 221e539eb8 Fix item fortification scrolls stacking (#38551) 2018-06-18 09:36:27 -05:00
Tad Hardestyandletterjay b5478b6e9d Fix repairing Cyborg headlamp even when its panel is closed (#38550) 2018-06-18 09:35:41 -05:00
deathride58 bf378cdc36 prevents the vast majority of IC in LOOC cases 2018-06-17 04:49:19 -04:00
Tad Hardestyandletterjay 27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
LetterJayandGitHub 98f6e8def0 Update randomverbs.dm 2018-06-16 16:47:19 -05:00
LetterJayandGitHub 162b827033 Update topic.dm 2018-06-16 16:44:42 -05:00
LetterJayandGitHub 68d33c79de Update admin_verbs.dm 2018-06-16 16:43:48 -05:00
LetterJayandGitHub 7f6f8eb21f Update admin.dm 2018-06-16 16:43:23 -05:00
LetterJayandGitHub 21af80d0d8 Merge pull request #7122 from Citadel-Station-13/upstream-merge-38493 
[MIRROR] Corrects typos
 2018-06-16 16:42:36 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 5ee2ee38b3 Revert "[MIRROR] Fixes chem heater trying to heat up empty beakers." 2018-06-16 16:18:50 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
Jordan Brownandletterjay e95851c8f6 Merge pull request #38476 from AutomaticFrenzy/patch/sparks 
[s] Fix launchpads creating way too many sparks
 2018-06-16 15:53:42 -05:00
Jordan Brownandletterjay 9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders 
Fix being able to pull mirage borders, others
 2018-06-16 15:50:27 -05:00
81Dentonandletterjay e92060a3a9 Makes the caravan ambush ruin harder to cheese (#38509) 
* makes caravan ambush more challenging

* SMASH
 2018-06-16 15:38:34 -05:00
Dax Dupontandletterjay 899d1e2d73 Cleans up the chem synths jesus christ what the fuck 2018-06-16 15:38:22 -05:00
cyclownsandletterjay 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
Dax Dupontandletterjay bde58b5442 Fixes missing creampies (#38490) 2018-06-16 06:19:45 -05:00
Emmett Gainesandletterjay 3e8168890f Removes an unused open turf var (#38486) 2018-06-16 06:19:37 -05:00
Jordan Brownandletterjay b4edde2c0a Add syndicate headset messages, squashes both together. 2018-06-16 06:19:29 -05:00
Jordan Brownandletterjay c25971d569 Merge pull request #38493 from ShizCalev/typo-fix 
Corrects typos
 2018-06-16 06:19:20 -05:00
Jordan Brownandletterjay 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 Hardestyandletterjay 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 Dupontandletterjay 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 Gainesandletterjay 1f3bbebe0a Moves arch component application to where archdrops is defined (#38487) 2018-06-16 06:17:48 -05:00
Jordan Brownandletterjay 8f2283c20e Adds some signal helpers (#38494) 2018-06-16 06:17:26 -05:00
AnturKandletterjay 460bcd399d Fixes attacking wooden walls (#38500) 2018-06-16 06:17:10 -05:00
Armhulenandletterjay bf4be90f76 quickie fixies (#38511) 2018-06-16 06:16:56 -05:00
AnturKandletterjay 09414f87d4 Fixes R&D display runtime (#38501) 2018-06-16 06:15:40 -05:00
CitadelStationBotandkevinz000 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
kevinz000andGitHub 5ca76bc438 Update mobs.dm (#7109) 2018-06-15 02:49:28 -07:00
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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