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
3014 Commits
Author SHA1 Message Date
Artur dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Putnam 0b2b34e867 Fixes multi-z proper 2020-05-12 19:13:39 -07:00
Putnam 25b2a856bf updated tank default release pressure for C++mos 2020-05-12 15:10:15 -07:00
Putnam 8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
Ghommie 7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
kevinz000 8952eb3e96 WOOPS 2020-05-12 07:45:00 -07:00
kevinz000 ea35e297c2 fixes 2020-05-12 07:38:52 -07:00
kevinz000andGitHub c473280099 Update subsystems.dm 2020-05-12 07:04:00 -07:00
Putnam 17826fe98b monstermos wow 2020-05-11 22:00:04 -07:00
Putnam f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-11 17:10:55 -07:00
Putnam 121d594faa Fixes 2020-05-11 17:09:35 -07:00
Putnam e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghommie dfae071015 Final adjustments. 2020-05-11 19:05:58 +02:00
kevinz000andGitHub dbfa8ac1ea Merge branch 'master' into typing_indicators 2020-05-11 05:00:23 -07:00
kevinz000andGitHub 0ed3b17d28 Merge pull request #12179 from Putnam3145/fix-atmos 
Brings back the gas archive
 2020-05-11 04:19:50 -07:00
kevinz000andGitHub 1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 
Porting "Refactors language holder"
 2020-05-10 14:16:42 -07:00
LinandGitHub 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
Ghommie 7779258b50 Tests, bug fixes and improvements. 2020-05-10 18:54:05 +02:00
kevinz000andGitHub 05cede4e4d fixes xenomorphs not being in combat mode (#12193) 
* ok

* Update combat.dm
 2020-05-10 17:38:07 +02:00
Ghommie 300331ccb7 Skill modifiers datum WIP. 2020-05-10 02:11:48 +02:00
Putnam 7004001e4b Brings back the gas archive 2020-05-09 11:23:38 -07:00
kevinz000 407b1c7447 Merge remote-tracking branch 'citadel/master' into projectiles_2 2020-05-08 23:32:01 -07:00
kevinz000 6d6239a8b4 kay 2020-05-08 22:59:51 -07:00
kevinz000 4cd5e08902 sigh 2020-05-08 21:27:36 -07: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
kevinz000 ee97ac8132 ok 2020-05-08 04:32:57 -07:00
kevinz000andGitHub 61692f290a Merge pull request #12121 from Ghommie/Ghommie-cit723 
Generic skills support for items, level based skill type. Wiring skill.
 2020-05-08 01:24:44 -07:00
kevinz000andGitHub 51081fcb1a ok (#12083) 2020-05-08 03:36:08 +02:00
Ghommie ddb50e2845 colors. 2020-05-08 02:24:49 +02:00
Ghommie 60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
kevinz000 05068f80db Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-07 10:57:10 -07:00
GhomandGitHub a273fc0fed Merge branch 'master' into Ghommie-cit721 2020-05-07 18:18:54 +02:00
kevinz000andGitHub 7c54da65a2 The great material rebalance (#12123) 
* haha bet

* Update stock_parts.dm

* ok
 2020-05-07 18:16:14 +02:00
kevinz000andGitHub 73144a4f92 Merge branch 'master' into typing_indicators 2020-05-07 09:04:44 -07:00
kevinz000 4be522ff30 more bitflag memes 2020-05-07 09:02:03 -07:00
kevinz000 532aba9157 fixes 2020-05-07 08:36:15 -07:00
Detective-GoogleGitHubkevinz000
 		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
kevinz000GitHubGhom
 		5c5fc37959 Introducing noitatsxoB (#12073) 
* okay

* ok

* ok

* ok

* ok

* why am i doing this

* WHY DID I DO THIS

* mirror doesn't work

* compile

* shuttles should work

* fix engine

* fix engine

* off by 1

* ok

* adds proccall to write next map

* haha post processing funny

* fixes

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-06 17:50:50 +02:00
kevinz000 f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
Ghommie 001109cfcd About ready. 2020-05-05 20:58:44 +02:00
kevinz000andGitHub 395e3e41cc Merge pull request #11874 from Ghommie/Ghommie-cit682 
General taur visuals refactor and other things.
 2020-05-04 20:52:33 -07: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
Kraseo c79ece7449 really surprised this wasn't done earlier 2020-05-04 18:30:27 +02:00
Ghommie 87389243e6 r p g skills WIP. 2020-05-04 17:30:15 +02:00
LinandGitHub 793cbd6cbd Merge pull request #12094 from Ghommie/Ghommie-cit719 
Makes privates not drop upon disembowelment or gibbing.
 2020-05-03 21:24:44 +00:00