Ghommie
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
kevinz000
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
Ghommie
7b257242c2
bullets won't work...
2019-10-24 10:44:57 +02:00
Ghommie
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
Ghommie
c882c098cc
Porting movespeed modification system updates.
2019-10-23 19:24:34 +02:00
Ghommie
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
Poojawa
184e81eec0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-16 01:51:51 -05:00
Fermi
dbcda948fb
Darn thing
2019-10-11 19:56:58 +01:00
Poojawa
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05:00
Poojawa
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
kevinz000
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
Linzolle
213bd2fc6b
fixes
2019-09-12 23:35:21 -05:00
Dap
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
Poojawa
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
Poojawa
bdae9e051b
Fixes some errant issues with overlays
2019-08-26 14:15:55 -05:00
Dap
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
Poojawa
32c7a7c3ee
Virology's broken as fuck, damnifino why
2019-08-21 03:36:40 -05:00
Poojawa
cede93299e
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2019-08-19 04:48:37 -05:00
Poojawa
2eac1b6ca2
Everything's working again, for now.
2019-08-17 08:04:18 -05:00
Poojawa
725a8046e1
just need items to actually have their overlays, ree
2019-08-17 04:50:24 -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
Poojawa
8bd54bcc54
I'm just waiting for a better idea before dumping this hot garbage again
2019-08-16 06:24:42 -05:00
Poojawa
c3fb13c140
meh.
2019-08-16 05:10:55 -05: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
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
Poojawa
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
Thalpy
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
Poojawa
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
Poojawa
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
Ghommie
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
Thalpy
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
kevinz000
c06d495731
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
...
REMOVE #C8A5DC. COLOR STRONG.
2019-07-14 14:48:49 -07:00
Thalpy
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
Ghommie
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
BurgerLua
5bd2f28d69
Removed #C8A5DC
2019-07-12 01:02:43 -07:00
Ghommie
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
Thalpy
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
deathride58
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
Thalpy
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01:00
Ghommie
fd68236594
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-06-24 05:54:14 +02:00
Ghommie
71298c084d
didn't init the list, bravo.
2019-06-24 03:09:43 +02:00
Ghommie
a2d896351b
Sort of porting "Changes the type pathing of some "random" items"
2019-06-23 07:10:11 +02:00
Ghommie
f97a4b3a78
changes.
2019-06-22 19:50:56 +02:00
Fermi
6b9becce71
Merge branch 'pr/14'
2019-06-14 21:29:04 +01:00
Poojawa
7738c97b80
NYEH. fuckin' memes
2019-06-12 04:33:14 -05:00
Poojawa
a05d51be3f
god I can't believe I'm matrixing gib overlays. save me PLEASE
2019-06-11 19:43:08 -05:00
Poojawa
26855d0698
Gibs spawn correctly. Just need to figure out the overlays now
2019-06-11 04:33:38 -05:00
Poojawa
69cefb604b
just need to fine tweak gibs and we're gucci
2019-06-09 11:10:23 -05:00
