shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
47 Commits
Author SHA1 Message Date
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot f626df9d1d push 2023-12-13 00:08:58 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot 75dd6a67df just a little check for if there's anything at all 2022-07-19 21:32:49 -03:00
DeltaFire 04d806c700 orange 
stabilized orange can now cool at most 5 per tick instead of infinite

robots only cool half, which means 5 per life tick (status effects fire twice per life tick total)

for robots, it cools towards ~ -100°C target temp, provided you are in a location that supports it.
 2022-01-31 00:50:22 +01:00
Cognition a03abc5658 forgot unscrew updating, adds appearance updating to stabilized yellow slime extract 2021-08-28 20:25:43 -07:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
silicons 3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
Putnam3145 899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
silicons 4653deddec updates 2021-06-28 12:55:22 -07:00
siliconsGitHubDeltaFire
 		3f4aff09d1 Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-02-05 00:59:19 -07:00
siliconsandGitHub 503d71ea45 Update _status_effects.dm 2021-01-31 18:03:36 -07:00
Letter N 021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
siliconsandGitHub fd77be9b89 Update _status_effects.dm 2021-01-09 16:44:56 -07:00
siliconsGitHubLetter NPutnam3145
 		19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
kevinz000andGitHub 395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 
nutrition adjustment wrapper procs from tg.
 2020-05-12 12:28:02 -07:00
Ghommie 667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Ghommie 2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
kevinz000andGitHub 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Ghommie 63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
TrilbySpaceClone 25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
kiwedesparsandGitHub 9b6cd54abf there's an extra space and it bugged me im sorry 2020-04-02 00:35:38 -07:00
kiwedesparsandGitHub eeccea989c purple nerf - light pink gets epi back 2020-04-02 00:34:44 -07:00
kiwedesparsandGitHub d9e8db8a6c Update _status_effects.dm 2020-04-01 23:31:51 -07:00
kevinz000GitHubGhom
 		0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
Ghommie 23ae9996d2 Something more about runtime errors. 2020-02-16 15:24:15 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
kevinz000andGitHub 804ee207e3 Update _status_effects.dm 2019-11-25 22:52:19 -07:00
kevinz000andGitHub 70ec955ef3 Update _status_effects.dm 2019-11-25 22:47:24 -07:00
Ghommie a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
Ghommie a95b13c24a jetpack fixes too & co 2019-10-23 19:31:54 +02:00
Ghommie c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +02:00
Ghommie fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
Ghommie ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie 0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
Amatsu Darkfyre 575c7ebeba Adds Chilling effects to Slime Crossbreeding, along with their icons and proper DM files. Nothing is modularized, as this is all content from upstream, so there should be no upstream conflicts when or if a sync occurs. 2019-03-08 04:02:21 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58andGitHub a2f1e9f47f Update _status_effects.dm 2018-06-11 23:13:11 -04:00
fludd12andletterjay c47c812fdf Fixes and Upgrades Stabilized Gold Extracts 2018-06-11 00:04:13 -05:00
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
Tad Hardestyandletterjay 021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
imsxzandCitadelStationBot e2aa213a52 BADBADBADBADBADBADBADBADBADBAD (#37452) 2018-04-27 04:14:11 -05:00
Poojawaanddeathride58 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