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

3422 Commits

Author SHA1 Message Date
Trilbyspaceclone
db87da599c Update firstaid.dm 2020-05-11 08:41:03 -04:00
Trilbyspaceclone
3c87647fd2 Update firstaid.dm 2020-05-11 08:32:36 -04:00
kevinz000
1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 
Porting "Refactors language holder"
 2020-05-10 14:16:42 -07: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
Lin
dd7db603d2 Merge pull request #12159 from Ghommie/Ghommie-cit732 
'mob_run_block' and 'mob_check_block' macros
 2020-05-10 18:25:16 +00:00
Kraseo
fd09bcf698 Fixes stacking multiple bear traps in one tile (#12168) 
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* no more deathstacks i guess

* that'll do piggy

* or not

* h elp

* ok this should do it for real this time

Co-authored-by: Changelogs <action@github.com>
 2020-05-09 14:25:31 +02:00
kevinz000
5a716bfcfd Merge pull request #12143 from Ghommie/Ghommie-cit729 
Demodularizing a few sprite assets.
 2020-05-08 23:29:34 -07:00
Ghommie
364ca3fdf2 There is more! 2020-05-09 01:14:29 +02:00
Ghommie
88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Lin
ab8342d453 Merge pull request #12141 from Trilbyspaceclone/patch-367 
Corrects medical packet crafting
 2020-05-08 21:27:43 +00:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie
ffd5dd9615 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732 2020-05-08 19:01:28 +02:00
Ghommie
a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02:00
Ghommie
aaa31c24ce Demodularizing a few sprite assets. 2020-05-08 04:02:31 +02:00
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Trilbyspaceclone
86fc39a777 le sigh 2020-05-07 17:55:25 -04: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
Ghommie
001109cfcd About ready. 2020-05-05 20:58:44 +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
Putnam
801956a1f9 Reverts #10352. 2020-05-03 17:44:00 -07:00
kevinz000
5bf5796fac Merge pull request #12086 from Citadel-Station-13/Ghommie-patch-3 
Webedit bugfixes
 2020-05-02 15:56:22 -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
kevinz000
fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715 
Fixing several reported issues.
 2020-05-02 15:54:32 -07:00
Lin
f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows 
Electrochromatic (dim-on-demand) windows
 2020-05-02 19:13:29 +00:00
Ghom
8bad031979 Update shields.dm 2020-05-02 01:01:14 +02:00
Ghom
400e2523c2 paint remover issue webedit. 2020-05-02 00:55:18 +02:00
Ghommie
b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
Ghommie
54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
Ghommie
a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +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
d176125c46 Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft 
More Useful Gauze MK II
 2020-04-29 12:02:51 -07:00
kevinz000
57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358 
Buffs shoulder holsters
 2020-04-29 12:00:03 -07:00
TrilbySpaceClone
5d6da47db7 Merge branch 'master' into medical-witchcraft 2020-04-27 07:25:18 -04:00
kevinz000
2e35a42f43 wow lotsa effort huh 2020-04-26 04:10:38 -07:00
kevinz000
af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
kevinz000
5c20bde9f0 Update shields.dm 2020-04-25 20:58:22 -07:00
kevinz000
565bfdb7b0 Merge pull request #11959 from Trilbyspaceclone/patch-351 
Nerfs spiders defence stat against flyswatters - Alt  Australian crew buff.
 2020-04-25 17:10:33 -07:00
kevinz000
af08e0fecf Merge pull request #11984 from Hatterhat/fastpump 
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
 2020-04-25 17:07:29 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Trilbyspaceclone
89bb18fe98 Update belt.dm 2020-04-25 00:50:03 -04:00
Ghom
21619b1ee3 Merge pull request #11925 from Trilbyspaceclone/patch-347 
The Pr that nerfs crayon eating
 2020-04-25 02:54:40 +02:00
Ghommie
0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghom
5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness 
Cybernetic arm implant balance pass (namely: shields)
 2020-04-25 02:47:28 +02:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
kevinz000
cf61795101 Merge pull request #11941 from kiwedespars/punch-bundle 
re-adds north star gloves to traitors for 20 tc
 2020-04-23 11:45:04 -07:00
Trilbyspaceclone
8bcdbf5fc6 Update weaponry.dm 2020-04-23 03:29:26 -04:00
TrilbySpaceClone
c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
kevinz000
411622430f Merge pull request #11985 from Ghommie/Ghommie-cit701 
Removal of backward 512 compatibility.
 2020-04-22 18:40:41 -07:00