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 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
Poojawa
|
c2cf8b28df
|
KISS principal
|
2019-06-06 21:35:50 -05:00 |
|
Poojawa
|
2e42656b6d
|
Revert "lel"
This reverts commit 9e01a078ec.
|
2019-06-06 19:40:08 -05:00 |
|
Poojawa
|
6b82c985ae
|
Revert "fuckit, I'm just gunna wholesale port from baycode I guess"
This reverts commit 11d10d3805.
|
2019-06-06 19:39:22 -05:00 |
|
Poojawa
|
2606dd0cdd
|
Revert "these too please thanks"
This reverts commit bc80c03679.
|
2019-06-06 19:39:17 -05:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
Poojawa
|
bc80c03679
|
these too please thanks
|
2019-06-05 04:55:49 -05:00 |
|
Poojawa
|
11d10d3805
|
fuckit, I'm just gunna wholesale port from baycode I guess
|
2019-06-05 04:55:36 -05:00 |
|
Poojawa
|
9e01a078ec
|
lel
|
2019-06-03 20:06:25 -05:00 |
|
Fermi
|
a5b3ec7939
|
Acid changes.
|
2019-06-02 22:38:55 +01:00 |
|
Fermi
|
1461f46292
|
Added a catch to prevent acid from being rascals.
|
2019-05-31 03:12:00 +01:00 |
|
Fermi
|
ae35366e97
|
Some fixes before bed.
|
2019-05-29 05:41:12 +01:00 |
|
Fermi
|
91cfd8e052
|
Before say component remove.
|
2019-05-29 03:01:47 +01:00 |
|
Poojawa
|
9f80896280
|
eh, was going somewhere with this
IPC gibspawner, looking into infinite footprints
|
2019-05-26 05:36:33 -05:00 |
|
Poojawa
|
4324d08f32
|
aaaaAAAAAAAA
NOW WHY DO I HAVE INFINITE FOOTPRINTS AAAAAAAAAAAAA
|
2019-05-22 04:52:21 -05:00 |
|
Poojawa
|
971ddef989
|
reverts forensics components. If I can't figure it out, MURDER IT
|
2019-05-22 04:10:29 -05:00 |
|
JTGSZ
|
84016ed3ef
|
Here we go.
|
2019-05-21 12:30:44 -04:00 |
|
Poojawa
|
0f6677b956
|
Blood colors happens to footprints now.
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
|
2019-05-16 08:23:53 -05:00 |
|
Poojawa
|
77abf6a179
|
just need the stupid component to work properly now
|
2019-05-14 02:36:23 -05:00 |
|
Poojawa
|
49a2f3cc63
|
I don't even fucking know anymore
|
2019-05-12 06:31:02 -05:00 |
|
Poojawa
|
ad5418f0a1
|
as it turns out, Creatures don't have minds
|
2019-05-12 04:43:52 -05:00 |
|
Poojawa
|
1a047c0068
|
I think I got it.
Also gibs should be better too.
|
2019-05-12 04:06:35 -05:00 |
|
Poojawa
|
fcdc748bf1
|
u h g. I hate this
|
2019-05-10 07:07:09 -05:00 |
|
Poojawa
|
88831da8f4
|
it's the one part that I keep saying I just need to get around to
|
2019-05-09 14:43:05 -05:00 |
|
Poojawa
|
8af9c6fad9
|
duplicate definitions? really? wtf
|
2019-05-09 10:32:14 -05:00 |
|