 Ghom
|
1a9bcddc61
|
Merge pull request #11938 from Owai-Seek/crab-meat-4-19-2020
Ups Crab Meat from 1 to 4
|
2020-04-22 03:31:19 +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 |
|
|
kevinz000
|
2c08b7847e
|
Merge pull request #11967 from Putnam3145/fix-the-damn-tesla-delams
Replaces, a ^ in supermatter calculations with **
|
2020-04-21 14:00:13 -07:00 |
|
|
Putnam3145
|
45f032a600
|
Merge pull request #11854 from Citadel-Station-13/Ghommie-patch-1
Something about configs and integers.
|
2020-04-21 13:04:31 -07:00 |
|
|
Putnam
|
a9600cffaa
|
Replaces a xor with a power??
|
2020-04-21 13:01:50 -07:00 |
|
|
Lin
|
ebc6cf8b8a
|
Merge pull request #11949 from NopemanMcHalt/gas_clear-fix
Fixes missing inventory/dropped icon of glass gasmask
|
2020-04-21 17:07:49 +00:00 |
|
|
Anonymous
|
cf94c41151
|
Merge branch 'master' into gas_clear-fix
|
2020-04-21 17:43:00 +03:00 |
|
|
nik707
|
5e1c6ae58e
|
Merge pull request #11945 from EmeraldSundisk/cogfix2.1
Cogfix2.1
|
2020-04-21 09:23:16 -05: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 |
|
|
kevinz000
|
055606b81b
|
Revert "Update SDQL_2_wrappers.dm"
This reverts commit 685546551c.
|
2020-04-20 20:27:18 -07:00 |
|
|
kevinz000
|
685546551c
|
Update SDQL_2_wrappers.dm
|
2020-04-20 20:26:50 -07:00 |
|
|
Lin
|
560cf8749b
|
Merge pull request #11943 from Citadel-Station-13/Ghommie-patch-2
Ports text formatted round timer from skyrat.
|
2020-04-21 02:13:31 +00:00 |
|
|
Ghom
|
79eb0f5838
|
Merge pull request #11956 from Trilbyspaceclone/crafting_menu
Fixes Crafting menu
|
2020-04-21 01:25:46 +02:00 |
|
|
TrilbySpaceClone
|
c3fc133282
|
*crys*
|
2020-04-20 18:28:57 -04:00 |
|
|
TrilbySpaceClone
|
58cb5e391e
|
*scream*
|
2020-04-20 18:22:13 -04:00 |
|
|
Ghom
|
50eae569eb
|
Merge pull request #11940 from Detective-Google/null-roddies
Turns chaplain null rod selection into a radial function(port TG#50512)
|
2020-04-20 23:53:24 +02:00 |
|
|
Ghom
|
6679d13509
|
Merge pull request #11939 from Owai-Seek/weight-class-4-19-20
Reduces weight classes of several items.
|
2020-04-20 23:53:07 +02:00 |
|
|
Ghom
|
0dc489e8de
|
Merge pull request #11798 from timothyteakettle/food-quality
adds a new feature to cooking: food quality
|
2020-04-20 23:48:35 +02:00 |
|
|
TrilbySpaceClone
|
747e27007f
|
***ahhhh***
|
2020-04-20 17:26:22 -04:00 |
|
|
Ghommie
|
03e873478c
|
Fixing CE jump suit/skirt and accessory overlays.
|
2020-04-20 23:11:58 +02:00 |
|
|
Ghom
|
a40f213325
|
Merge pull request #11951 from Putnam3145/fix-liver-runtime
Fixes a runtime in livers.
|
2020-04-20 23:11:31 +02:00 |
|
|
TrilbySpaceClone
|
4d55f169d5
|
oh god oh fuck
|
2020-04-20 17:05:03 -04:00 |
|
|
Ghom
|
c7780bde9e
|
Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5
Shuffles resist embed higher up on the resist chain
|
2020-04-20 22:34:03 +02:00 |
|
|
Timothy Teakettle
|
c5b8c45bf0
|
Merge branch 'master' into food-quality
|
2020-04-20 19:53:39 +01:00 |
|
|
kevinz000
|
a984fc5e3d
|
Update living.dm
|
2020-04-20 11:45:22 -07:00 |
|
|
kevinz000
|
096a182a84
|
Update living.dm
|
2020-04-20 11:44:59 -07:00 |
|
|
kevinz000
|
791c3029a8
|
Merge pull request #11897 from DeltaFire15/gang-decon-message
Snitches now get stitches
|
2020-04-20 11:43:37 -07:00 |
|
|
kevinz000
|
62418d3fb8
|
Merge pull request #11909 from Putnam3145/owai-broom-mop
Adds more service stuff to lathes.
|
2020-04-20 11:43:30 -07:00 |
|
|
kevinz000
|
85fcdbf673
|
Merge pull request #11916 from Trilbyspaceclone/crafting_menu
Cleans up misc tab in the crafting menu
|
2020-04-20 11:37:13 -07:00 |
|
|
kevinz000
|
893f57cb63
|
Merge pull request #11919 from Ghommie/Ghommie-cit690
Nerfing the bonus reagents from higher tier microwaves.
|
2020-04-20 11:34:53 -07:00 |
|
|
kevinz000
|
33cfb9a566
|
Merge pull request #11920 from Ghommie/Ghommie-cit691
Removing troublesome and filler uplink items.
|
2020-04-20 11:34:44 -07:00 |
|
|
kevinz000
|
cbc9f325f4
|
Merge pull request #11921 from necromanceranne/minor_fix_scarp_stammod
Sleeping Carp has a Stamina Mod again, gets Taser resistance, various fixes (no more universal pugilism)
|
2020-04-20 11:34:06 -07:00 |
|
|
kevinz000
|
ff651ac881
|
Merge pull request #11931 from Ghommie/Ghommie-cit694
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-20 11:31:31 -07:00 |
|
|
Putnam
|
5df4287c8d
|
Fixes a runtime in livers.
|
2020-04-20 11:10:43 -07:00 |
|
|
Ghom
|
af620582b1
|
Merge pull request #11924 from Trilbyspaceclone/patch-346
Moves barkeeps cryo fluid to emag only in the Soda Dispender
|
2020-04-20 19:35:31 +02:00 |
|
|
necromanceranne
|
9919a23966
|
This fixes everyone being a pugilist holy fuck
|
2020-04-21 00:36:54 +10:00 |
|
|
Anonymous
|
60e89f154a
|
Fixes missing inv/dropped icon of glass gasmask
|
2020-04-20 14:44:19 +03:00 |
|
|
Ghom
|
10ae9bb51d
|
Merge pull request #11944 from Trilbyspaceclone/patch-349
Corrects shield implants being invisable
|
2020-04-20 13:39:07 +02:00 |
|
|
Ghom
|
bb5c4d9dd4
|
Merge pull request #11948 from kevinz000/woops
potentially fixes biotypes breaking in viruses
|
2020-04-20 13:38:36 +02:00 |
|
|
kevinz000
|
dc97b65681
|
Revert "Revert "Update mobs.dm""
This reverts commit d8d6ae8555.
|
2020-04-20 04:03:13 -07:00 |
|
|
kevinz000
|
d8d6ae8555
|
Revert "Update mobs.dm"
This reverts commit 1b9bfe9674.
|
2020-04-20 04:01:57 -07:00 |
|
|
kevinz000
|
1b9bfe9674
|
Update mobs.dm
|
2020-04-20 04:00:47 -07:00 |
|
|
EmeraldSundisk
|
10d8ef79db
|
Update CogStation.dmm
|
2020-04-19 20:33:35 -07:00 |
|
|
Trilbyspaceclone
|
6fcec77e9b
|
Update shields.dm
|
2020-04-19 23:18:17 -04:00 |
|
|
Ghom
|
31d7fad1b4
|
Update time_track.dm
|
2020-04-20 02:39:40 +02:00 |
|
|
Ghom
|
d2cfb7608a
|
Merge pull request #11926 from MrJWhit/adds-another-power-line-in-box
Fixing up of boxstation
|
2020-04-20 02:35:23 +02:00 |
|
|
Ghom
|
2cf8dad8ae
|
Merge pull request #11928 from Putnam3145/traitor-class-reroll
Made traitor classes rerollable, reassignable by admins
|
2020-04-20 02:30:33 +02:00 |
|
|
Ghom
|
850c08cb0e
|
Merge pull request #11894 from NopemanMcHalt/trek_tmp
Adds not-so-great TMP-era trek utility uniform, also fixes loadout restriction descs
|
2020-04-20 02:21:24 +02:00 |
|
|
kevinz000
|
ae27bf90e4
|
Merge pull request #11846 from Putnam3145/vore-optimization
Optimizing vore + commenting out simplemob vore (sorry)
|
2020-04-19 16:45:44 -07:00 |
|
|
Detective Google
|
0c2f0a99d5
|
fixes the fact that some citadel null rods aren't null rod subtypes
|
2020-04-19 17:18:40 -05:00 |
|