Poojawa
b29607c019
It's working again, I guess. wtf
2019-08-21 01:36:59 -05:00
Poojawa
23333f6ea5
reverts the majority of clean act because it doesn't work properly otherwise
2019-08-20 23:03:31 -05:00
Poojawa
bda3ac8745
blood dna is fixed, your ERP code is too
2019-08-20 07:41:50 -05:00
Poojawa
cede93299e
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2019-08-19 04:48:37 -05:00
Poojawa
5746126794
since it conflicted there, let's just fix it here
2019-08-17 05:43:24 -05:00
Poojawa
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
Poojawa
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
kevinz000 and GitHub
9071917e72
Merge pull request #9088 from Poojawa/blurry-runtimes
...
Fixes some runtimes and removes a holodeck exploit
2019-08-16 17:05:21 -07:00
kevinz000 and GitHub
97306ff53c
Merge pull request #9107 from deathride58/fixesarest
...
Fixes handcuffs being impossible to actually resist out of
2019-08-16 16:57:36 -07:00
Poojawa
d71f37167f
I'm about to go fucking APE
...
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
2019-08-16 04:58:16 -05:00
Poojawa
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
Poojawa
017a3111ec
Yeah this is a much, much better way of doing it.
2019-08-15 08:37:10 -05:00
Poojawa
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
deathride58 and GitHub
5f6a110f73
Merge pull request #9052 from Citadel-Station-13/kevinz000-patch-71
...
Hmm, today the Hierophant will go sicko mode on shaft miners.
2019-08-14 15:43:51 -04:00
Sishen
08bba425e4
run in a straight line to win gamemode lol
2019-08-12 19:42:58 -04:00
kevinz000 and GitHub
a971390cff
Merge pull request #8992 from jakeramsay007/Helmet-Internals
...
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
kevinz000 and GitHub
123b478edd
Merge pull request #8927 from Ghommie/Ghommie-cit151
...
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
kevinz000 and GitHub
b75c82b4ee
Merge pull request #9054 from Sishen1542/stando
...
stands now remove trait_nodeath from their user if given by memento mori
2019-08-11 10:11:11 -07:00
deathride58
5dddb11773
Fixes handcuffs being impossible to actually resist out of
2019-08-11 08:37:00 -04:00
Poojawa
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
BlackMajor and GitHub
5dcd419d8a
Merge pull request #8356 from Thalpy/master
...
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
Sishen
51011ccf97
Update guardian.dm
2019-08-10 07:05:53 -04:00
Sishen
15dbb7ff32
Update guardian.dm
2019-08-10 07:03:45 -04:00
kevinz000 and GitHub
74008beb8f
Merge pull request #9066 from Ghommie/Ghommie-cit181
...
Two lines fixes for invisible zipties and borked legcuffs.
2019-08-09 22:17:31 -07:00
Ghommie
ee57720ee3
underwear colors fix 2: The revenge of the crunch.
2019-08-09 05:11:12 +02:00
Poojawa
f76bb27127
Fixes some runtimes and removes a holodeck exploit
...
and a cleanup >.>;
2019-08-08 21:33:42 -05:00
Sishen
1fc69a13a4
okay fixed
2019-08-08 22:02:12 -04:00
Ghommie
12c4fc139d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-08-09 04:00:23 +02:00
Poojawa
98a279a6db
likely fixes the examine bug lol
2019-08-08 17:45:01 -05:00
Poojawa
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
Sishen
582b355224
Update guardian.dm
2019-08-08 11:00:23 -04:00
Ghommie
00bca0dd39
raise priority.
2019-08-07 19:20:14 +02:00
Fermi
ee1b04eefb
Fixes potential "trapped as ghost" problems and examine+scanner text
2019-08-06 19:54:07 +01:00
Fermi
f4c5e6fd2f
Attempts to deal with the potential future problem of people stunlocking
2019-08-06 16:43:55 +01:00
Sishen
9f5b54940c
adds in a memento mori check
2019-08-05 21:31:17 -04:00
EgoSumStultus
d9a6be301a
more fixes
2019-08-05 07:47:47 -07:00
EgoSumStultus
55b39a9cc6
male AI vox
2019-08-05 05:01:43 -07:00
Sishen
e3c3742aec
Update guardian.dm
2019-08-05 06:27:10 -04:00
kevinz000 and GitHub
48db0b129e
Update hierophant.dm
2019-08-05 01:55:05 -07:00
kevinz000 and GitHub
58f8920008
Update hierophant.dm
2019-08-05 01:51:51 -07:00
kevinz000 and GitHub
fb4709f6db
Update hierophant.dm
2019-08-05 01:49:28 -07:00
Thalpy and GitHub
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
kevinz000 and GitHub
f1c9a07f6d
Merge pull request #8912 from Ghommie/Ghommie-cit146
...
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
kevinz000 and GitHub
489b4c78dc
Merge pull request #8996 from Ghommie/Ghommie-cit166
...
Adds in worn overlays for different types of cuffs.
2019-08-04 19:19:19 -07:00
kevinz000 and GitHub
5cfb7ef49d
Merge pull request #8999 from BurgerLUA/Xeno-Nerf-part-1-out-of-20
...
Xenomorph larvae no longer gib and inexplicably delete your brain when hatching
2019-08-04 19:18:53 -07:00
kevinz000 and GitHub
8452cf3b8a
Merge pull request #9014 from Ghommie/Ghommie-cit170
...
undergarment fixes.
2019-08-04 19:13:21 -07:00
kevinz000 and GitHub
f8dbe71bf7
Merge pull request #9035 from Poojawa/vore-toggle-fix
...
Fixes a runtime with a simple mob verb
2019-08-04 19:12:57 -07:00
kevinz000 and GitHub
53a9f3ac51
Merge pull request #9036 from Linzolle/invisiclothes
...
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
2019-08-04 19:09:36 -07:00
Poojawa