 kevinz000
|
6428f4a0c2
|
ok
|
2020-04-20 12:18:09 -07:00 |
|
|
kevinz000
|
90f6904f44
|
fix
|
2020-04-20 12:16:42 -07: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 |
|
|
Ghom
|
9df0982da3
|
Update mirror.dm
|
2020-04-20 17:57:08 +02:00 |
|
|
Ghom
|
4cf80cb277
|
Update preferences_savefile.dm
|
2020-04-20 17:56:48 +02:00 |
|
|
Ghom
|
e870830a72
|
Update preferences.dm
|
2020-04-20 17:52:10 +02:00 |
|
|
necromanceranne
|
9919a23966
|
This fixes everyone being a pugilist holy fuck
|
2020-04-21 00:36:54 +10:00 |
|
|
Ghom
|
7c6c20ec7a
|
Update game_options.dm
|
2020-04-20 16:04:55 +02:00 |
|
|
Ghom
|
10ae9bb51d
|
Merge pull request #11944 from Trilbyspaceclone/patch-349
Corrects shield implants being invisable
|
2020-04-20 13:39:07 +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 |
|
|
Trilbyspaceclone
|
6fcec77e9b
|
Update shields.dm
|
2020-04-19 23:18:17 -04:00 |
|
|
Trilbyspaceclone
|
e311aafbc0
|
Update snacks_meat.dm
|
2020-04-19 22:21:07 -04:00 |
|
|
Ghom
|
31d7fad1b4
|
Update time_track.dm
|
2020-04-20 02:39:40 +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 |
|
|
kiwedespars
|
842483190a
|
Update code/game/objects/items/storage/uplink_kits.dm
my brain is small when working git.
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
|
2020-04-19 17:18:14 -07:00 |
|
|
kiwedespars
|
b21ee932cf
|
maybe this is travis's issue?
|
2020-04-19 17:06:21 -07:00 |
|
|
kiwedespars
|
42fac43807
|
Merge branch 'master' into punch-bundle
|
2020-04-19 16:50:01 -07:00 |
|
|
kiwedespars
|
25e0c47225
|
oops
|
2020-04-19 16:48:37 -07: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 |
|
|
TrilbySpaceClone
|
d98f536003
|
map fix + cube fix
|
2020-04-19 19:38:23 -04:00 |
|
|
TrilbySpaceClone
|
3a78da9332
|
commit clearifcation
|
2020-04-19 19:18:19 -04:00 |
|
|
TrilbySpaceClone
|
25b1b889dc
|
amazing truely amazing
|
2020-04-19 19:09:20 -04:00 |
|
|
kiwedespars
|
2c362dd84f
|
Update uplink_bundles.dm
|
2020-04-19 15:58:31 -07:00 |
|
|
kiwedespars
|
c3905c8c2b
|
Update uplink_kits.dm
|
2020-04-19 15:56:31 -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 |
|
|
Detective Google
|
5376ca81b5
|
Turns chaplain null rod selection into a radial function(port TG#50512)
|
2020-04-19 16:57:02 -05:00 |
|
|
Winter Flare
|
8e3f48a761
|
Reduces (or gives) weight classes to several items.
|
2020-04-19 17:13:19 -04:00 |
|
|
Winter Flare
|
dc5c8fb657
|
Ups Crab Meat from 1 to 4
|
2020-04-19 17:00:48 -04:00 |
|
|
CitadelStationBot
|
22dd41925f
|
Merge pull request #11937 from Citadel-Station-13/Ghommie-patch-3
Fixing critter crates having an invalid icon state when opened.
|
2020-04-19 15:11:28 -05:00 |
|
|
Lin
|
88b5ca72b7
|
Merge pull request #11906 from Citadel-Station-13/Ghommie-patch-2
Fixing Forensic scanners not reading blood DNA.
|
2020-04-19 16:53:54 +00:00 |
|
|
Lin
|
d75e3f79bd
|
Merge pull request #11917 from Ghommie/Ghommie-cit688
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-19 16:52:33 +00:00 |
|
|
Ghom
|
8551998833
|
Update critter.dm
|
2020-04-19 14:07:13 +02:00 |
|
|
kevinz000
|
792af56b67
|
Update riding.dm
|
2020-04-19 00:48:51 -07:00 |
|
|
Anonymous
|
043950a3ee
|
Merge branch 'master' into trek_tmp
# Conflicts Resolved:
# icons/obj/clothing/uniforms.dmi
|
2020-04-19 09:51:21 +03:00 |
|
|
Ghom
|
f714403d6e
|
Merge pull request #11895 from Seris02/piggybackfix
fixes piggyback merging
|
2020-04-19 04:56:04 +02:00 |
|
|
Trilbyspaceclone
|
2039fb80e6
|
Update fancy.dm
|
2020-04-18 22:37:05 -04:00 |
|