shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,739 Commits 5 Branches 0 Tags
16bd86e4cb2fa5ae65082033fa1d18efbcbd5110
Commit Graph

6635 Commits

Author SHA1 Message Date
Jordan Brown
16bd86e4cb Merge pull request #38633 from ExcessiveUseOfCobblestone/patch-46 
potency gene disks now clarify what the % means on examine
 2018-06-21 16:54:20 -05:00
CitadelStationBot
f393d68499 [MIRROR] fixes anomaly cores being flamable (#7207) 
* fixes anomaly cores being flamable (#38607)

* oranges-is-gay

* swap

* fixes anomaly cores being flamable
 2018-06-20 22:40:54 -07:00
CitadelStationBot
49a34614cd [MIRROR] Admin Kicks now prompt the admin to avoid accidental kicking (#7191) 
* Admin Kicks now prompt the admin to avoid accidental kicking (#38544)

* TO THE PLAAAAAACE I BELOOOOOONG

* TAKE ME HOOOOOOOOOOME

* WEEEEEEST VIRGINIAAAAAAAAAAAAAAAAAAA

* fixes my shit

* No meming in admin frontend

* Admin Kicks now prompt the admin to avoid accidental kicking
 2018-06-19 14:51:14 -07:00
deathride58
7150c207aa Fixes a merge conflict 2018-06-19 07:30:52 -04:00
LetterJay
e448002390 Merge pull request #7177 from Citadel-Station-13/upstream-merge-38555 
[MIRROR] Dsay now shows admin rank instead of ADMIN
 2018-06-18 22:01:42 -05:00
LetterJay
861c5cdcc1 Merge pull request #7176 from Citadel-Station-13/upstream-merge-38556 
[MIRROR] Makes a thing use its macro
 2018-06-18 22:01:26 -05:00
LetterJay
12876c7252 Merge pull request #7172 from Citadel-Station-13/upstream-merge-38553 
[MIRROR] Allow admin ghosts to use .p and .d say prefixes
 2018-06-18 22:00:41 -05:00
LetterJay
7a4aad91cb Merge pull request #7171 from Citadel-Station-13/upstream-merge-38552 
[MIRROR] Fix gulag shuttle moving instantly
 2018-06-18 22:00:13 -05:00
LetterJay
50da00b26c Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540 
[MIRROR] Cleans up supermatter related varedits
 2018-06-18 21:58:15 -05:00
Jordan Brown
cf96c7dd11 Dsay now shows admin rank instead of ADMIN (#38555) 
* Dsay now shows admin rank instead of ADMIN

* All caps to protect the dongs of our admemes
 2018-06-18 19:17:55 -05:00
Jordan Brown
99fee78179 Makes a thing use its macro (#38556) 2018-06-18 19:16:43 -05:00
CitadelStationBot
db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
Jordan Brown
684ceb2125 Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode 
Allow admin ghosts to use .p and .d say prefixes
 2018-06-18 13:16:06 -05:00
Jordan Brown
4ad2dd22ef Merge pull request #38552 from AutomaticFrenzy/patch/labor-shuttle 
Fix gulag shuttle moving instantly
 2018-06-18 13:13:35 -05:00
LetterJay
34254116bc Merge pull request #7164 from Citadel-Station-13/upstream-merge-38527 
[MIRROR] Fix ripples appearing too broadly and disappearing too soon
 2018-06-18 12:29:54 -05:00
LetterJay
fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270 
[MIRROR] [READY] advanced foam extinguisers [READY]
 2018-06-18 12:28:42 -05:00
LetterJay
6d74717b39 Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533 
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
 2018-06-18 12:27:45 -05:00
LetterJay
29ae18fb1a Merge pull request #7157 from Citadel-Station-13/upstream-merge-38461 
[MIRROR] Fixes the Blob being banished to the shadow realm
 2018-06-18 12:23:03 -05:00
LetterJay
62490e07a8 Merge pull request #7154 from Citadel-Station-13/upstream-merge-38551 
[MIRROR] Fix item fortification scrolls stacking
 2018-06-18 12:18:30 -05:00
LetterJay
d42c0d42de Merge pull request #7153 from Citadel-Station-13/upstream-merge-38550 
[MIRROR] Fix repairing Cyborg headlamp even when its panel is closed
 2018-06-18 10:13:05 -05:00
LetterJay
75f0dfcf35 Merge pull request #7146 from deathride58/loocdudewtf 
Prevents the vast majority of IC in LOOC cases
 2018-06-18 10:11:48 -05:00
LetterJay
c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 
[MIRROR] [s] Fix launchpads creating way too many sparks
 2018-06-18 10:09:42 -05:00
LetterJay
c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496 
[MIRROR] Fix being able to pull mirage borders, others
 2018-06-18 10:09:20 -05:00
LetterJay
90df70a8f1 Merge pull request #7134 from Citadel-Station-13/upstream-merge-38509 
[MIRROR] Makes the caravan ambush ruin harder to cheese
 2018-06-18 09:53:05 -05:00
LetterJay
8393a6b34b Merge pull request #7133 from Citadel-Station-13/upstream-merge-38510 
[MIRROR] Cleans up the chem synths jesus christ what the fuck
 2018-06-18 09:52:24 -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
Jordan Brown
a70cbed1f7 Merge pull request #38527 from AutomaticFrenzy/patch/ripples 
Fix ripples appearing too broadly and disappearing too soon
 2018-06-18 09:38:42 -05:00
81Denton
9b1f891a29 Cleans up supermatter related varedits (#38540) 
* Cleans up supermatter related varedits

* reee

* fakecrystal
 2018-06-18 09:38:16 -05:00
Tlaltecuhtli
1a42719d80 Advanced foam extinguisers (#38270) 
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
 2018-06-18 09:38:07 -05:00
81Denton
241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-18 09:37:48 -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
CitrusGender
ba6c5324f0 Fixes the Blob being banished to the shadow realm (#38461) 
* blob now respawns like nuke disk if off z-level

* can't do it, sorry nak

* space

* muh codebaby

* Revert "CitrusGender my friend, don't you start away uneasy"
 2018-06-18 09:37:35 -05:00
Tad Hardesty
221e539eb8 Fix item fortification scrolls stacking (#38551) 2018-06-18 09:36:27 -05:00
Tad Hardesty
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
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
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
Jordan Brown
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 Brown
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
81Denton
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 Dupont
899d1e2d73 Cleans up the chem synths jesus christ what the fuck 2018-06-16 15:38:22 -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
Jordan Brown
b4edde2c0a Add syndicate headset messages, squashes both together. 2018-06-16 06:19:29 -05:00