b5010c5cfc
Update machine_vending.dm
2020-05-08 06:49:26 -04:00
a6bf258f5c
Update ice_demon.dm
2020-05-08 04:33:40 -04:00
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
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
ae3b2a58f9
Merge pull request #12129 from Ghommie/Ghommie-cit726
...
Fixing some sprite issues and nit-picks.
2020-05-08 03:00:20 +00:00
aaa31c24ce
Demodularizing a few sprite assets.
2020-05-08 04:02:31 +02:00
51081fcb1a
ok ( #12083 )
2020-05-08 03:36:08 +02:00
192c0dcc1a
Demodularizing the arousal module.
2020-05-08 03:35:29 +02:00
60bdbfaf61
Merge conflicts, procs instead of macros, mood signals.
2020-05-08 02:12:41 +02:00
74e7f7ea46
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit726
2020-05-07 22:14:11 +02:00
3914c1bd65
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit727
2020-05-07 21:41:47 +02:00
9c08df761f
fixes
2020-05-07 11:50:38 -07:00
05068f80db
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-07 10:57:10 -07:00
ebb6eaa69a
a
2020-05-07 09:30:34 -07:00
a273fc0fed
Merge branch 'master' into Ghommie-cit721
2020-05-07 18:18:54 +02:00
7c54da65a2
The great material rebalance ( #12123 )
...
* haha bet
* Update stock_parts.dm
* ok
2020-05-07 18:16:14 +02:00
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
f642148218
Merge pull request #12126 from Trilbyspaceclone/patch-365
...
Nerfs combat MK.II hypos
2020-05-07 09:10:16 -07:00
888f0a932f
Merge pull request #12124 from Ghommie/Ghommie-cit725
...
Makes wings/horns colors dna features instead of human variables
2020-05-07 09:10:08 -07:00
73144a4f92
Merge branch 'master' into typing_indicators
2020-05-07 09:04:44 -07:00
f02e8da23a
blockdirs
2020-05-07 08:54:21 -07:00
532aba9157
fixes
2020-05-07 08:36:15 -07:00
cb432761d5
Update SDQL_2.dm ( #12135 )
2020-05-07 14:47:17 +02:00
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
1c389abea6
hm
2020-05-07 05:39:17 -07:00
e24bda9a9f
this ( #12122 )
2020-05-07 01:08:48 +02:00
a09c7180cb
Dims the lights again.
2020-05-06 23:55:36 +02:00
c97f86ae5a
Update mob_movement.dm
2020-05-06 23:36:40 +02:00
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
b5a4bceafb
Fixing some sprite issues and nit-picks.
2020-05-06 17:46:15 +02:00
3397c2284a
Merge pull request #12128 from Citadel-Station-13/Ghommie-patch-1
...
Webedit PR fixing a few sprite accessories.
2020-05-06 08:35:08 -07:00
13eeffbf27
Update wings.dm
2020-05-06 17:19:52 +02:00
d13ed03861
Update tails.dm
2020-05-06 17:18:03 +02:00
9c31a89fde
Update spines.dm
2020-05-06 17:15:50 +02:00
7477878062
Update snouts.dm
2020-05-06 17:12:15 +02:00
106fb6496e
Update hypospray.dm
2020-05-06 05:30:54 -04:00
f034c7c536
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-05 17:38:43 -07:00
3a843f6da4
a
2020-05-05 17:06:07 -07:00
94d67ab640
Update mob_movement.dm
2020-05-06 01:15:30 +02:00
e9ccc3ac62
Test and update.
2020-05-06 01:03:54 +02:00
b36e44d983
Merge branch 'master' into Ghommie-cit724
2020-05-05 23:32:51 +02:00
56fe430a25
ok ( #12119 )
2020-05-05 23:18:09 +02:00
001109cfcd
About ready.
2020-05-05 20:58:44 +02:00
4327d8eb87
why did i design this way why why why
2020-05-05 04:32:35 -07:00
ccfce7cb64
Makes wings/horns colors dna features instead of human defines
2020-05-05 06:22:58 +02:00
f50e661e0a
Merge pull request #12106 from Putnam3145/revert-supermatter
...
Reverts #10352 .
2020-05-04 21:21:09 -07:00
066479da5f
mandatory bump to savefile version.
2020-05-05 06:13:17 +02:00
395e3e41cc
Merge pull request #11874 from Ghommie/Ghommie-cit682
...
General taur visuals refactor and other things.
2020-05-04 20:52:33 -07:00
e26bf5b2af
Merge pull request #12115 from Kraseo/the-funny-aheal
...
Slow death of Mining PvP: Removes aheals from legion cores
2020-05-04 20:46:40 -07:00
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
Trilbyspaceclone