b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
135608551f
Merge remote-tracking branch 'upstream/master'
2019-11-24 02:45:28 +00:00
ce7e9ac452
Revert "Removes the random love"
...
This reverts commit b056d91ea5
2019-11-24 02:45:06 +00:00
fb2c29caff
Revert "Okay"
...
This reverts commit 37ac0ccb66
2019-11-24 02:44:32 +00:00
00601a0c87
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 02:44:00 +00:00
8af225e6e3
PLASE
2019-11-24 02:41:21 +00:00
fb4a47d310
Added more items to vendors.
...
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
2019-11-23 15:58:04 -05:00
e19b85c823
change recipe
2019-11-23 12:58:42 -06:00
f0996208a3
Merge pull request #9874 from Ghommie/Ghommie-cit379
...
Honkbot slip and slide fun ride.
2019-11-23 11:49:32 -07:00
be679b97a6
Merge pull request #9885 from Commandersand/cuckcult
...
Makes the brass skewer more ouchie than ouchie~
2019-11-23 11:45:24 -07:00
f88ed98ee4
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
...
Anthromorphic Insect Revert
2019-11-23 11:44:52 -07:00
88762c5d89
Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand
...
Able to use Legion Cores in-hand
2019-11-23 11:39:35 -07:00
eee8c8c108
Shields Bounty is now 2 for 3000
2019-11-23 03:11:00 -05:00
e954cec58c
Merge pull request #9898 from Ghommie/Ghommie-cit387
...
Dreamchecker compatibility changes, part 3.
2019-11-23 05:52:44 +00:00
1c8b557466
fixes AI.dm again
2019-11-23 04:13:30 +00:00
6426e5dade
makes the icons not break
2019-11-23 03:54:39 +00:00
a6ff44782a
adds more unique ai holograms
2019-11-23 03:51:04 +00:00
37ac0ccb66
Okay
2019-11-23 00:23:43 +00:00
b404e18b15
Merge branch 'master' into FERMICHEMCurTweaks
2019-11-23 00:10:33 +00:00
399986f3f7
Forgot to update the procs
2019-11-22 23:57:09 +00:00
77913406ed
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 18:50:24 -05:00
6145cd0d96
Merge pull request #9886 from Ghommie/Ghommie-cit384
...
chem dispenser beakers and bikehorn fixes.
2019-11-22 15:48:28 -08:00
b056d91ea5
Removes the random love
2019-11-22 23:48:21 +00:00
b7f7342e43
Merge pull request #9900 from Ghommie/Ghommie-cit388
...
fixing a get_idcard runtime. or The betrayal of the ?. operator
2019-11-22 15:41:52 -08:00
a7918717ff
fixes compile errors.
2019-11-22 18:22:53 -05:00
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
03dae580a9
Minor QoL and Wardrobe Updates
2019-11-22 14:08:12 -05:00
7d3599b2f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
2019-11-22 18:53:58 +01:00
386dd6aa8a
Made Medical Emergency Crate Drop-Pod only.
...
Trill made me do it.
2019-11-22 06:44:59 -05:00
216790d442
Merge branch 'master' into HeadCorgi
2019-11-22 21:54:05 +11:00
b01be3b1ff
Merge branch 'master' into crow
2019-11-22 05:48:36 -05:00
05b22caaa3
Added 12 new crates, fixed issues raised in #9901
...
Remake of previous PR that I broke due to inexperiance.
Added 12 new crates to cargo.
Re-ordered some some of the crates.
2019-11-22 02:37:57 -05:00
66a97cb224
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-22 05:17:42 +01:00
0ac188bde9
Unmodularize gamemodes folder.
2019-11-22 05:00:53 +01:00
98998ca85f
un-moths the anthromorphic insects
2019-11-21 19:47:48 -08:00
2136968585
Ring ring
2019-11-21 21:55:17 -05:00
522a664f55
Merge pull request #9887 from Ghommie/Ghommie-cit385
...
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
1ddb9935ff
Merge pull request #9530 from Ghommie/Ghommie-cit245
...
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
c2d182d50d
Merge pull request #9823 from Seris02/wintergalorefix
...
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
2019-11-22 01:16:35 +00:00
9af48caa62
OKAY DONE ARGH
2019-11-21 20:46:00 +00:00
7b17bf2acd
god damn bitflags ARGH
2019-11-21 20:30:49 +00:00
db74091dd4
Strange revert
2019-11-21 19:47:00 +00:00
0cce3a01f4
Ghommie's requiem
2019-11-21 19:39:55 +00:00
bd07ff4bf7
This should be the one!
2019-11-21 18:55:43 +00:00
2b8ea0f7a6
Whoops
...
Fixes a typo
2019-11-21 19:14:38 +01:00
4974400ccb
Merge branch 'master' into xantholne-berets01
2019-11-21 11:01:42 -07:00
edd1946bf9
Changes code as requested by kev
...
Very very light knockdown for the clock spearthrow, CLAMPed values for everything that used a += (including the blood stun used on normal people), removed the vars as they were deemed unneccessary by kev so the values were moved directly to the debuff effects.
2019-11-21 17:20:33 +01:00
00bffba7ea
Why do surgeries always end up with jank
2019-11-21 15:57:21 +00:00
46076c95c7
Ghommie is a good friend
2019-11-21 14:22:04 +00:00
Fermi