shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,796 Commits 5 Branches 0 Tags
db87da599c19afda6b62af80cdab2c0bce0c47fa
Commit Graph

1197 Commits

Author SHA1 Message Date
kevinz000
992905846d Merge pull request #12160 from Linzolle/cold-mining 
Explorer's gear gives full-body cold resistance
 2020-05-11 04:08:17 -07:00
Ghommie
e8a0ea5acc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit731 2020-05-11 00:34:22 +02:00
kevinz000
6b9fc7eccf Merge pull request #12169 from Ghommie/Ghommie-cit734 
Porting some radial menu updates, and that one clown mask skin.
 2020-05-10 14:14:19 -07:00
Ghommie
88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Suicidalpickles
2d9aac8f31 cakehat cat wearing a cakehat while patting a cak (#12166) 
fix
 2020-05-09 00:40:07 +02:00
Linzolle
24da94720b cold res 2020-05-08 11:51:24 -05:00
Ghommie
90bf157f5e Fixing some runtimes and issues. 2020-05-08 17:17:33 +02:00
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002) 
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
 2020-05-07 14:46:16 +02:00
kappa-sama
e24bda9a9f this (#12122) 2020-05-07 01:08:48 +02:00
Ghommie
3de0e545c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-05 05:44:55 +02:00
Ghommie
f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
kevinz000
5bf7fd0030 Merge pull request #12087 from Ghommie/Ghommie-cit718 
Fixing more issues.
 2020-05-02 15:56:28 -07:00
kevinz000
b68f1aaf72 Merge pull request #12084 from Ghommie/Ghommie-cit717 
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
 2020-05-02 15:55:19 -07:00
Ghommie
202b517fa0 Fixing more issues. 2020-05-02 02:05:56 +02:00
Ghommie
b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
Ghommie
cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
kevinz000
269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
kevinz000
24bac60a95 Merge pull request #12012 from Ghommie/Ghommie-cit710 
Fixing non-skirt dresses being invisible on digitigrades.
 2020-04-25 17:05:49 -07:00
Lin
25c9653540 Merge pull request #11966 from NopemanMcHalt/digi-justice 
Fixes cosmetic tactifool sprite not using digitigrade sprites
 2020-04-25 03:31:04 +00:00
Ghommie
0f654d9f0e Fixing dresses being invisible on digitigrades. 2020-04-25 02:23:13 +02:00
Ghom
e4c6df71fc Update tacklers.dm 2020-04-23 14:35:36 +02:00
kevinz000
c43f4e2e5e Update tacklers.dm 2020-04-22 22:27:48 -07:00
kevinz000
af222768fe Revert "Update tacklers.dm" 
This reverts commit b6a47a06ed.
 2020-04-22 22:27:17 -07:00
kevinz000
b6a47a06ed Update tacklers.dm 2020-04-22 22:26:39 -07:00
Lin
7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692 
Shielded Component
 2020-04-22 20:33:12 +00:00
Ghom
aab62f196d Merge pull request #11954 from Trilbyspaceclone/patch-350 
Makes medical hardsuits a smig faster
 2020-04-22 03:32:07 +02:00
Lin
3483ab7947 Merge pull request #11957 from Ghommie/Ghommie-cit696 
Fixing CE jump suit/skirt and accessory overlays.
 2020-04-21 22:17:16 +00:00
Anonymous
e6159b1a82 Actually, this is better. 2020-04-21 22:24:38 +03:00
Anonymous
21c304c5ad Fixes cosmetic tactifool sprite not using digi 
Also adds " to the armor values
 2020-04-21 22:10:19 +03:00
Ghommie
01f444b761 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-21 20:45:58 +02:00
Ghommie
824904844c Componentized for sanity. 2020-04-21 19:51:44 +02:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghommie
03e873478c Fixing CE jump suit/skirt and accessory overlays. 2020-04-20 23:11:58 +02:00
Trilbyspaceclone
047bb6c162 Update hardsuit.dm 2020-04-20 16:19:30 -04:00
Ghommie
5a4fecdeb8 tested and it works now, I'm glad. 2020-04-20 19:22:42 +02:00
Ghommie
0bef955806 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 15:14:30 +02:00
Ghommie
3bef4b88ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 02:29:34 +02:00
Anonymous
043950a3ee Merge branch 'master' into trek_tmp 
# Conflicts Resolved:
#	icons/obj/clothing/uniforms.dmi
 2020-04-19 09:51:21 +03:00
Ghommie
9c8f6cd00f peeves. 2020-04-19 02:03:05 +02:00
Ghommie
e3fb978465 Shielded element. 2020-04-19 01:48:51 +02:00
Artur
f0823bc2b6 Combat looks better 2020-04-18 13:57:34 +03:00
Ghom
6a0af190ea I'm a bit busy handling multiple issues. 2020-04-17 20:47:02 +02:00
Ghom
be0409a94a Update toggles.dm 2020-04-17 19:58:57 +02:00
Anonymous
383014bad3 Merge branch 'master' into trek_tmp 
# Conflicts Resolved:
#	icons/mob/clothing/uniform.dmi
#	icons/mob/clothing/uniform_digi.dmi
#	icons/obj/clothing/uniforms.dmi
 2020-04-17 19:40:17 +03:00
Ghommie
7581d1d5cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit686 2020-04-17 18:37:25 +02:00
Ghommie
c5c75c0870 Fixing some more mistakes I did to clothing. 2020-04-17 18:32:11 +02:00
Artur
eafc69aa65 Reviewer suggestion, reduces paralyze 
And ports that commit that ghommie said
 2020-04-17 16:22:15 +03:00
kevinz000
09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667 
Minor snowflakes clothing variations refactor. Removal of copypasted states.
 2020-04-17 05:49:09 -07:00