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

294 Commits

Author SHA1 Message Date
Trilbyspaceclone
7e8ba9a23c [Ready] New adv surgery tools! (#7879) 
* Fixing updater

* Update tools.dm

* Update all_nodes.dm

* Update medical_designs.dm

* shit.jpg

* Update medical_designs.dm

* Update medical_designs.dm

* Apply suggestions from code review

Ragolutions' Grammar rework

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Reg being the best

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Huh
 2019-01-08 02:36:43 -08:00
deathride58
9f294f523e buffs and nerfs night vision trait 2018-11-30 20:36:27 -05:00
izzyinbox
172a46bcbe adds voice of god orgasm and dab commands (#7694) 2018-11-09 19:10:42 -08:00
deathride58
07e6609cd7 Merge pull request #7649 from Trilbyspaceclone/Limitless_Power 
Adds in more prosthetic lims and surplus printable
 2018-10-14 04:43:41 -04:00
Trilbyspaceclone
55ad0da84f The lims 2018-10-12 12:10:03 -04:00
Poojawa
a05acf5c7e Finishes sprites, ensures proper equipping 
Also blacklists customs that aren't in suit.dmi yet
 2018-10-07 04:56:22 -05:00
deathride58
d7bca1922d Mostly fixes stamina by making knockdown() apply its staminaloss to the chest, giving adjuststaminaloss() new args, disabling limb-specific stamina regen for the chest, and disabling head stamina (#7596) 
* fixes stamina (hopefully)

* makes adjuststaminaloss() apply to the chest by default, makes it possible to target specific zones with adjuststaminaloss.

* i dropped out of first grade dont bulli

* REE

* be patient im a dum

* come on
 2018-10-03 20:44:09 -07:00
Poojawa
729790f9d3 Overhauls some code, double checks uniforms 2018-09-28 03:54:57 -05:00
Poojawa
e4cdb0c853 Merge branch 'master' into override-override 2018-09-28 01:49:35 -05:00
Poojawa
70d969c5cf Enables Digitigrade jumpsuit wearing 2018-09-27 05:08:39 -05:00
Poojawa
865b6a5b3a Finished code 2018-09-26 08:59:48 -05:00
Poojawa
a4810b6666 some code before I ran out of time at work 2018-09-26 08:59:48 -05:00
Poojawa
99e57fb221 various citadel tweaks/fixes 
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
 2018-09-17 03:26:05 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites 
Nanites port
 2018-09-03 13:47:28 -04:00
kevinz000
0bdf684933 Update augments_internal.dm 2018-08-24 23:28:06 -07:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Jordan Brown
8115f0acda Merge pull request #38576 from AnturK/runtimeL 
Fixes alternative method of removing legcuffs.
 2018-06-19 09:19:15 -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
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
c1aab03bb5 Merge branch 'master' into upstream-merge-37530 2018-05-22 07:19:06 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
Nich
177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
deathride58
146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
Dax Dupont
48c37df7cd [s] Fixes bioware surgery exploit (#37860) 
* Fixes bioware surgery

* my ass must blast
 2018-05-16 14:34:36 -05:00
XDTM
ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
Armhulen
04057dc7d6 Plasmamen organs GET sprites! (#37595) 
* DONE

* initial

* Removes random slashes
 2018-05-02 21:21:11 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
ec2de88a65 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use 2018-04-29 17:32:12 -05:00
deathride58
532ccc412c Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373 
[MIRROR] Fixes missing augmentation hands
 2018-04-27 09:42:46 +00:00
deathride58
62d64a8647 Merge pull request #6509 from Citadel-Station-13/upstream-merge-37402 
[MIRROR] Fixes autosurgeon icon
 2018-04-27 09:32:05 +00:00
ShizCalev
9e3f99092f Fixes missing augmentation hands (#37373) 2018-04-27 02:42:13 -05:00
AnturK
e50b647ea4 Fixes autosurgeon icon (#37402) 
* Fixes autosurgeon icon

* Duh
 2018-04-24 16:03:33 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Jordan Brown
edf4488c6b Merge pull request #37201 from kevinz000/patch-483 
Adds missing arguments to eye insert procs
 2018-04-15 22:25:14 -05:00
Winterous
065522800a Forcing the human liver to actually do its job v2 (#37032) 
* Update liver.dm

* Update liver.dm

* Update liver.dm
 2018-04-11 09:33:49 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
LetterJay
a5ec18d566 Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816 
[MIRROR] Fixes mutant bodypart assignments
 2018-04-01 19:50:58 -05:00
LetterJay
9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617 
[MIRROR] Improves some logging legibility
 2018-03-31 06:17:11 -05:00
LetterJay
694f3a6949 Merge pull request #6149 from Citadel-Station-13/upstream-merge-36636 
[MIRROR] Fixes prosthetic limbs injury messages
 2018-03-31 06:16:48 -05:00
ShizCalev
1c76539a5b Fixes mutant bodypart assignments 2018-03-31 06:15:24 -05:00
vuonojenmustaturska
adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup 
Improves some logging legibility
 2018-03-28 12:17:32 -05:00
vuonojenmustaturska
888ca609a8 Merge pull request #36636 from ShizCalev/robo-limb-shake-message 
Fixes prosthetic limbs injury messages
 2018-03-28 12:17:23 -05:00
iksyp
c0e45aa0a8 Night vision goggles no longer cancel out thermal eyes (#36609) 
cl
fix: night vision goggles no longer overwrite thermal eyes. nvg eyes no longer overwrite thermal goggles.
/cl

fixes #35921
 2018-03-28 12:16:38 -05:00
CitadelStationBot
1c5081af32 [MIRROR] Logs abductor chat (#6114) 
* Logs abductor chat (#36713)

* Logs abductor chat
 2018-03-26 04:33:28 -05:00
Tlaltecuhtli
3fab4a3b41 fixes #36538 (#36539) 
Removes toolarm prefix from toolarm surgery tools.
 2018-03-21 16:14:35 -05:00