 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 |
|
|
Ghommie
|
3bef4b88ba
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-04-20 02:29:34 +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 |
|
|
TrilbySpaceClone
|
37a0fb558c
|
with fixes and new gauze
|
2020-04-19 15:29:48 -04: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 |
|
|
kevinz000
|
24370db5eb
|
Merge pull request #11930 from Ghommie/Ghommie-cit693
More ToS Compliance.
|
2020-04-18 19:33:10 -07:00 |
|
|
kevinz000
|
ab01d91971
|
Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
|
2020-04-18 19:32:50 -07:00 |
|
|
kevinz000
|
b65ad491b4
|
Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2
Revert "Makes so turning in place updates riders when riding someone's back"
|
2020-04-18 19:32:34 -07:00 |
|
|
kevinz000
|
5fd862e19d
|
Merge pull request #11860 from Trilbyspaceclone/shields!
Adds more shields and tweaks a few!
|
2020-04-18 19:32:09 -07:00 |
|
|
Trilbyspaceclone
|
42b81fee3d
|
Update drink_reagents.dm
|
2020-04-18 21:57:36 -04:00 |
|
|
Ghommie
|
98081aa56b
|
Some mispelled filepaths.
|
2020-04-19 03:15:51 +02:00 |
|
|
Ghommie
|
d5a43be181
|
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-19 03:07:45 +02:00 |
|
|
Ghom
|
6e62f7a2a3
|
Merge pull request #11878 from Arturlang/fixes_zipties_being_red
Makes zipties white again
|
2020-04-19 02:45:31 +02:00 |
|
|
Ghommie
|
39aef14924
|
More ToS Compliance.
|
2020-04-19 02:40:58 +02:00 |
|
|
Lin
|
8d8a0b0f45
|
Merge pull request #11899 from Ghommie/Ghommie-cit686
Fixing some more mistakes I did to clothing.
|
2020-04-19 00:24:29 +00:00 |
|
|
Ghommie
|
9c8f6cd00f
|
peeves.
|
2020-04-19 02:03:05 +02:00 |
|
|
Ghommie
|
e3fb978465
|
Shielded element.
|
2020-04-19 01:48:51 +02:00 |
|
|
Ghom
|
998b199dba
|
Merge pull request #11927 from kappa-sama/patch-22
ports tg's fix to instant surgery closing
|
2020-04-19 01:21:23 +02:00 |
|
|
Ghom
|
7e57a3410e
|
Merge pull request #11905 from Putnam3145/fix-rads-again
Fixes a divide-by-zero
|
2020-04-19 00:32:41 +02:00 |
|
|
Putnam
|
9976fab42b
|
Made traitor classes rerollable, reassignable by admins
|
2020-04-18 14:40:41 -07:00 |
|
|
kappa-sama
|
2654352d0c
|
tg surgery fixes time
|
2020-04-18 17:37:19 -04:00 |
|
|
Trilbyspaceclone
|
efdab85261
|
Update crayons.dm
|
2020-04-18 17:10:31 -04:00 |
|
|
Trilbyspaceclone
|
a5b7f506f9
|
Update chem_dispenser.dm
|
2020-04-18 16:42:46 -04:00 |
|