shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,175 Commits 5 Branches 0 Tags
f4658b49b15dce2a3a9e03acf0cfbbdf1aafd036
Commit Graph

61 Commits

Author SHA1 Message Date
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
kiwedespars
69d927e756 Merge branch 'master' into void-but-for-real 2021-03-12 23:10:19 -08:00
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
kiwedespars
3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
silicons
e7220e842e things 2020-09-15 15:29:34 -07:00
silicons
42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
Detective Google
948081fdce outdoor lights, rad protection 2020-05-12 17:13:23 -05:00
kevinz000
bd7b1b1193 fixes 2020-04-30 01:23:21 -07:00
Detective Google
71be8ed2fc ports all the tg junk for icemoon, not yet changed to make it all compile 2020-04-24 00:02:03 -05:00
kevinz000
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
BlackMajor
43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
kevinz000
d8d6a8efb8 lazy-be-gone 2020-02-12 02:15:56 -07:00
kevinz000
33b3d06d4c im lazy 2020-02-12 01:44:28 -07:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
Ghom
4016835b0a Merge pull request #9798 from Citadel-Station-13/kevinz000-patch-114 
Radiation storms no longer do random mutations in of itself, but are far more lethal
 2019-12-20 14:32:42 +01:00
Ghommie
19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00
kevinz000
06ae6cde09 Update code/datums/weather/weather_types/radiation_storm.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-14 01:39:42 -07:00
kevinz000
690d6f90ec Update radiation_storm.dm 2019-11-12 23:50:40 -07:00
kevinz000
53bfbacbe0 Update radiation_storm.dm 2019-11-12 23:48:39 -07:00
kevinz000
d858bd0526 Update radiation_storm.dm 2019-11-12 23:45:47 -07:00
Ghommie
a204fddc4b Fixing some issues with dullahans. 2019-11-01 18:51:06 +01:00
Poojawa
b5841c718b Genpop for security 2019-08-07 06:14:35 -05:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Tupinambis
828b631570 Increased Ash Walker resistances, makes them ash proof. Improves the Base. 2018-12-15 15:33:19 -06:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Grandmother of 50
023f93f734 Fixes Bedbuckling to avoid Floor is Lava (#37752) 
* Update floor_is_lava.dm

* Pulls the check out of the loop.
 2018-05-12 17:44:12 -05:00
kevinz000
72b2d9b436 floor is lava no longer hurts silicons (#37119) 
* floor is lava no longer hurts silicons

* efficiency
 2018-04-12 06:37:54 -05:00
Jordan Brown
c47a034069 Merge pull request #36834 from KorPhaeron/darkness2 
Removes advanced darkness
 2018-04-01 00:08:53 -05:00
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710) 
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
 2018-03-05 12:34:01 -06:00
CitadelStationBot
567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674) 
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
 2018-02-23 17:42:57 -06:00
CitadelStationBot
03dfbe7137 [MIRROR] Ports Barometers from Yogstation (#5647) 
* Ports Barometers from Yogstation (#35730)

* Ports Barometers from Yogstation

* Ports Barometers from Yogstation

* Added missing barometer_predictable bools

* Gives the atmos analyzer love instead of a new item.

* Moves playsound under cooldown to prevent soundspam.

* Ports Barometers from Yogstation
 2018-02-21 19:44:20 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
Tad Hardesty
4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633) 
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
 2018-01-21 13:34:04 -06:00
Tad Hardesty
aa774aeaea Fix MMIs in mechs and firesuits being burned by ash storms (#34349) 2018-01-15 02:58:24 -06:00
deathride58
d26a9b23a4 datums folder 2018-01-03 23:29:47 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
ExcessiveUseOfCobblestone
0df9db51f3 Being buckled to a bed now saves you from "the floor is lava" (#33204) 
* Update floor_is_lava.dm

* Switcheroo

* )))))))))))))
 2017-12-03 13:16:37 -06:00
Emmett Gaines
6f940baa0a New ambience for ash storms (#32213) 
song name?
 2017-10-30 15:22:23 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
CitadelStationBot
1edd7b82d1 [MIRROR] Minor weather code split/refactor (#2837) 
* Minor weather code split/refactor

* Delete weather_types.dm

* Update radiation_storm.dm
 2017-09-18 01:46:41 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
a1c41c461a Ashstorms Matryoshka bugfix (#2167) 2017-07-28 16:50:53 -07:00
CitadelStationBot
efa9de6da9 Area Refactor + Var-edit Cleanup 2017-05-22 22:08:35 -05:00
Poojawa
7e9b96a00f April sync (#360) 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
 2017-04-13 23:37:00 -05:00
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303) 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
 2017-03-21 11:44:10 -05:00