266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
5fcf5b1c5e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-10-29 13:38:16 +01:00
4aa1d55abb
Porting multi-z support updates.
2019-10-27 16:32:32 +01:00
cb74be29ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262
2019-10-25 12:40:50 +02:00
2ae111eaf0
Merge pull request #9587 from Ghommie/Ghommie-cit258
...
Porting components updates and fixing phantom thief component.
2019-10-24 18:38:39 -07:00
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
7b257242c2
bullets won't work...
2019-10-24 10:44:57 +02:00
4c8d7023c5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258
2019-10-24 09:50:20 +02:00
9250b1c103
big uppdate season
2019-10-23 21:08:47 -05:00
c882c098cc
Porting movespeed modification system updates.
2019-10-23 19:24:34 +02:00
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
ec22088534
Complying with suggestions. Also stops dnr observers from getting ghost role notifications
2019-10-20 09:15:35 +02:00
184e81eec0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-16 01:51:51 -05:00
dbcda948fb
Darn thing
2019-10-11 19:56:58 +01:00
9f8ad74bf9
New traumas and some other things.
2019-10-08 03:53:01 -04:00
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
42613d1800
Merge pull request #9251 from Linzolle/chaplain-fashion-time
...
Allow all chaplain gear to equip the same things in their suit storage
2019-09-13 10:42:42 -07:00
213bd2fc6b
fixes
2019-09-12 23:35:21 -05:00
9f275ebf01
Ports trim decals
...
## About The Pull Request
So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.
## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06:00
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
bdae9e051b
Fixes some errant issues with overlays
2019-08-26 14:15:55 -05:00
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
32c7a7c3ee
Virology's broken as fuck, damnifino why
2019-08-21 03:36:40 -05:00
cede93299e
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2019-08-19 04:48:37 -05:00
2eac1b6ca2
Everything's working again, for now.
2019-08-17 08:04:18 -05:00
725a8046e1
just need items to actually have their overlays, ree
2019-08-17 04:50:24 -05:00
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
8bd54bcc54
I'm just waiting for a better idea before dumping this hot garbage again
2019-08-16 06:24:42 -05:00
c3fb13c140
meh.
2019-08-16 05:10:55 -05:00
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
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
c8d7f1909d
holy FUCK I got gib overlays working. Why wasn't it before?
...
No one will ever know.
2019-08-01 00:58:24 -05:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
c06d495731
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
...
REMOVE #C8A5DC. COLOR STRONG.
2019-07-14 14:48:49 -07:00
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
5bd2f28d69
Removed #C8A5DC
2019-07-12 01:02:43 -07:00
92fadcf230
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84
2019-07-11 09:07:11 +02:00
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
d218739bf8
Merge pull request #8740 from Ghommie/Ghommie-cit87
...
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-07-08 18:06:11 -04:00
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01:00
fd68236594
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-06-24 05:54:14 +02:00
71298c084d
didn't init the list, bravo.
2019-06-24 03:09:43 +02:00
Linzolle