shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,915 Commits 5 Branches 0 Tags
9c9ba116a329f451c774beea4886436d3b2a2a52
Commit Graph

377 Commits

Author SHA1 Message Date
deathride58
c8d51c4231 Attempts to improve the performance of /mob/Stat() by using defines instead of procs for grabbing the current time 2019-04-02 01:11:29 -04:00
deathride58
3b3fcb5d19 Merge pull request #8094 from Trilbyspaceclone/patch-75 
[MIRROR] Watcher's Wing No Longer Perma-Disarms #41708
 2019-03-08 20:48:40 -05:00
Trilbyspaceclone
33213b0099 Update kinetic_crusher.dm 2019-03-05 01:06:16 -05:00
Trilbyspaceclone
cecf7e251f Update machine_vending.dm 2019-03-05 00:06:33 -05:00
Trilbyspaceclone
0b0bfbac10 Update machine_vending.dm 2019-03-04 23:48:12 -05:00
Trilbyspaceclone
5255a31e3d Update machine_vending.dm 2019-03-04 23:46:42 -05:00
Trilbyspaceclone
6a4ce07c0b Update machine_vending.dm 2019-03-04 23:27:38 -05:00
Ignari-Coldstorm
aa57d42d6c Fixes duplicate medipen. 
Fixes a duplicate medipen showing up in vendor list.
 2018-12-17 20:28:04 -06:00
Ignari-Coldstorm
9c16527cd4 Mining Vendor and PPKA changes! (#7817) 
* Mining Vendor and PPKA changes!

Adjusted the prices on a couple items as well as added in the pocket extinguisher to the vendor. Adjusted the Premium Proto-Kinetic Accelerator to have one less range.

* Update machine_vending.dm
 2018-12-16 03:56:21 -08:00
deathride58
6c5694ce0c Merge pull request #7780 from Ignari-Coldstorm/Premium-KPA 
Adds a new PKA to the mining Vendor
 2018-12-03 11:20:37 -05:00
Ignari_Coldstorm
747f5a0a4e Update machine_vending.dm 2018-12-01 17:57:04 -06:00
deathride58
9158d323a5 buffs lavaland's cacti just a smidge by increasing the amount of vitfro they have by 1.5x (4 > 6) 2018-11-20 06:19:27 -05:00
deathride58
19addaefec Merge pull request #7669 from nik707/suitupgrade 
Exosuit sprites have arrived. "Now with more gasmask."
 2018-10-22 22:37:02 -04:00
Poojawa
e6fc75d1ae Adds some missing suits, digi and taur EXO 2018-10-21 00:56:16 -05:00
nik707
04bacde07d adds the gasmasks lol im fucking dumb 2018-10-21 00:20:31 -05:00
Poojawa
42b1d03d2a [READY] Tauric full body suits (#7639) 
* let's get this back on the table

* split 'em up because sorting memes

* Gets stuff code-ready, sprite work to continue

Engineering / Atmosia / Cheng
Civilian Space
Blood Red / Red and Black
Riot / Armor vests
Radiation / Fire / Atmosia Fire
Bio Suits (Viro/CMO/basic)
ERT / Deathsquad

* It's messy, but it works so w/e

* let there be more tail access

* finishes naga taur spriting

* memes

* super fixes any lingering memes

* leg experiment

* nah, this isn't gunna work.

* poked at canine again

* saving memes

* tweaks some fixes and things

* finished quad suits, added bomb suits for nagas also

* "inconsistant indentation" Byond you fuck

* Take that, byond

* The war on Byond continues

* let's make sure the explorer gear uses fancy sprites

* syndiE ??? wtf did I sleep type
 2018-10-18 09:30:37 -07:00
deathride58
bfef3b2c28 fixes an href exploit in labor camp point claim consoles (#7653) 2018-10-18 09:26:07 -07:00
deathride58
766819f403 Merge pull request #7616 from Citadel-Station-13/kevinz000-patch-5 
crushers can now apply upgrades by hitting an upgrade with it, meaning cyborgs can upgrade their crushers
 2018-10-13 00:18:23 -04:00
nik707
25c4a66842 adds some stuff 2018-10-10 19:28:55 -05:00
nik707
1532802511 fixes dumb 2018-10-04 22:04:12 -05:00
nik707
33d2a20ef2 first nerf of Mining armor, F in chat 2018-10-04 21:37:26 -05:00
kevinz000
70428a67de Update kinetic_crusher.dm 2018-10-03 20:53:07 -07:00
deathride58
19e0a4f924 Merge pull request #7552 from Citadel-Station-13/kevinz000-patch-6 
combine with mob buff PR - buffs kinetic crushers
 2018-10-03 23:49:23 -04:00
nik707
595d4c3504 Alternative Miner Suits (#7611) 
* haha what the fuck this took like a solid 6 hours

* allows new suits to spawn on legion corpses.

* Update flags.dm

* Fix conflict maybe

* pls work

* im a big gay
 2018-10-03 20:32:25 -07:00
Trilbyspaceclone
e494bbb3e3 Adds in other medical kits for miners to buy! (Nerfs brute treatment kit cost from 600 to 800 too) (#7553) 
* Adds in other medical kits for miners to buy!(Buffs cost as well)

* Shit
 2018-09-26 12:06:14 -07:00
Poojawa
e5a96114ca Fixes exploit and a tgui issue with Hypo vials 2018-09-24 00:38:15 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000
8fb6127bfe Update kinetic_crusher.dm 2018-09-06 20:00:59 -07:00
kevinz000
abb8fc2627 Update kinetic_crusher.dm 2018-09-06 19:30:50 -07:00
kevinz000
4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362) 
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-20 03:40:39 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
0a28cbdfc4 Merge pull request #7217 from Citadel-Station-13/upstream-merge-38570 
[MIRROR] Fixes gulag stacker not giving points after RPG loot event
 2018-06-24 15:16:35 -05:00
YPOQ
a6cfd22b79 Fixes gulag stacker not giving points after RPG loot event (#38570) 
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
 2018-06-21 16:30:39 -05:00
Grandmother of 50
2fefc185d3 Equalizes Roundstart Mining Options (Removes some Advanced Scanners and Explorer Webbings) (#38153) 2018-06-20 02:43:42 -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
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
4ad2dd22ef Merge pull request #38552 from AutomaticFrenzy/patch/labor-shuttle 
Fix gulag shuttle moving instantly
 2018-06-18 13:13:35 -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
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
Tad Hardesty
f962a02ef7 Fix meson goggles and lantern wisps conflicting (#38211) 2018-06-07 20:33:50 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
Jordan Brown
4d1bc5ed3b Merge pull request #38027 from AutomaticFrenzy/patch/jacobs-ladder-vr 
[s] Fix Jacob's Ladder allowing access to VR
 2018-05-25 10:46:47 -05:00
LetterJay
2908431bac Merge pull request #6857 from Citadel-Station-13/upstream-merge-37951 
[MIRROR] adds logging to mayhem bottle and blood frenzy
 2018-05-25 02:35:43 -05:00
imsxz
5016ea6186 Add logging to mayhem bottle and blood frenzy (#37951) 
* who the fuck didnt make this logged ages ago jesus fucking christ

* who fucking coded this garbage why isnt it a status effect

* Update mines.dm

* reeeeeeeee

* reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
 2018-05-23 01:41:33 -05:00