cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,298 Commits 55 Branches 0 Tags
95b8cd3956c3375acd3e76589b24082ba0f3d023
Commit Graph

7976 Commits

Author SHA1 Message Date
Ghommie
5ed6a18ef7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit740 2020-05-10 22:36:04 +02:00
Ghommie
e0b91c53af Purging unused dogborg items. 2020-05-10 22:17:05 +02:00
Ghommie
667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Putnam3145
e1d113b970 Config for antag forcing (#12171) 2020-05-10 21:35:20 +02: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
Detective Google
424133c48a adds the actual snow taxi to snaxi 2020-05-09 22:20:26 -05:00
Ghommie
300331ccb7 Skill modifiers datum WIP. 2020-05-10 02:11:48 +02:00
Detective Google
806966cd75 fixes the second level not spawning any rocks (and therefore no glass) while I have a PR open 2020-05-09 17:51:45 -05:00
Putnam
0fcc7c93a2 Pods archive too whoops 2020-05-09 11:27:26 -07: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
407b1c7447 Merge remote-tracking branch 'citadel/master' into projectiles_2 2020-05-08 23:32:01 -07:00
kevinz000
5a716bfcfd Merge pull request #12143 from Ghommie/Ghommie-cit729 
Demodularizing a few sprite assets.
 2020-05-08 23:29:34 -07:00
kevinz000
c435c6b6a8 Merge pull request #12158 from Trilbyspaceclone/helper-text 
What if mechs give more information?
 2020-05-08 23:29:01 -07:00
kevinz000
1be722d53f Merge pull request #12163 from Citadel-Station-13/Ghommie-patch-5 
Fixing rechargers not putting the item in hands
 2020-05-08 23:27:37 -07:00
kevinz000
6d6239a8b4 kay 2020-05-08 22:59:51 -07:00
Ghommie
4c26beba38 ah 2020-05-09 01:50:24 +02:00
Detective Google
35566b5795 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-08 18:21:57 -05: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
Ghom
97c5eb9b8f Fixing chargers not putting the item in hands 2020-05-08 22:20:54 +02:00
Trilbyspaceclone
43f6acd81b *crys* 2020-05-08 15:42:35 -04:00
Trilbyspaceclone
a711f312ce Update mecha_construction_paths.dm 2020-05-08 15:37:17 -04:00
Trilbyspaceclone
c9f8f55945 Update mecha_construction_paths.dm 2020-05-08 15:29:20 -04:00
Trilbyspaceclone
e0d56363d4 Update mecha_construction_paths.dm 2020-05-08 15:13:13 -04:00
Trilbyspaceclone
5ab1d04154 Update mecha_construction_paths.dm 2020-05-08 14:44:27 -04:00
Trilbyspaceclone
9caa236e85 Update mecha_construction_paths.dm 2020-05-08 14:22:15 -04: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
TrilbySpaceClone
47319cc8c9 What if mechs give more information? 2020-05-08 11:28:39 -04:00
Putnam3145
602154abe8 Fixes cloner sabotage to only check on station Z (#12140) 2020-05-08 15:48:23 +02:00
kevinz000
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
Detective Google
4e84b92e2e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-08 01:13:12 -05:00
kevinz000
43dc1319d9 Merge pull request #12097 from Ghommie/Ghommie-cit720 
Implementing the NO_PUBLIC_LATHE build_type flag.
 2020-05-07 21:04:57 -07:00
Ghommie
aaa31c24ce Demodularizing a few sprite assets. 2020-05-08 04:02:31 +02:00
Ghommie
3dfef3c393 . 2020-05-08 02:50:14 +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
kevinz000
2a33060c98 Update world.dm 2020-05-07 10:44:45 -07:00
Ghom
a273fc0fed Merge branch 'master' into Ghommie-cit721 2020-05-07 18:18:54 +02:00
kevinz000
7c54da65a2 The great material rebalance (#12123) 
* haha bet

* Update stock_parts.dm

* ok
 2020-05-07 18:16:14 +02:00
kevinz000
7828c4a5ab Merge pull request #12102 from Ghommie/Ghommie-cit722 
Removing cargo "paperwork" and a few other bloat packs.
 2020-05-07 09:11:45 -07: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
kevinz000
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
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
Detective Google
f812cddf93 unfucks this and makes it use the icebox framework 2020-05-03 20:04:20 -05:00
Putnam
801956a1f9 Reverts #10352. 2020-05-03 17:44:00 -07:00