Poojawa
|
faccc43461
|
fucking github REEEEEEEEEEE
|
2018-01-31 18:33:46 -06:00 |
|
Poojawa
|
ebf5366e73
|
Delta was apparantly a github copy/paste wtf
|
2018-01-31 18:23:42 -06:00 |
|
Poojawa
|
ab0e0667f2
|
Makes Travis happy
|
2018-01-31 18:11:19 -06:00 |
|
Poojawa
|
cf537cd417
|
Removing abandon map.
|
2018-01-31 11:18:41 -06:00 |
|
Poojawa
|
01c4b6caf8
|
ALWAYS KEEP THE REFS UP TO DATE NERDS
|
2018-01-31 10:22:30 -06:00 |
|
Poojawa
|
2f16174e7c
|
overdue refractor on layering code
also probably fixes missing sprites
|
2018-01-31 10:13:17 -06:00 |
|
Poojawa
|
aa04e62b29
|
cult lol xd
|
2018-01-31 08:07:22 -06:00 |
|
Poojawa
|
4ce8f9ec80
|
clean up icons folder of unused .dmis
|
2018-01-31 07:38:58 -06:00 |
|
Poojawa
|
d7f8b8fbe4
|
dme enabling
|
2018-01-31 07:17:21 -06:00 |
|
Poojawa
|
d7659ac6b2
|
sync with master
|
2018-01-31 07:02:55 -06:00 |
|
Poojawa
|
a7f0ffb6f0
|
modules
|
2018-01-31 06:56:28 -06:00 |
|
Poojawa
|
fb5de29784
|
cleanup of game folder, other fixes
|
2018-01-31 06:39:18 -06:00 |
|
Poojawa
|
56232d5d60
|
Maps and misc
|
2018-01-31 06:20:26 -06:00 |
|
LetterJay
|
18229f81b7
|
Merge pull request #5221 from Citadel-Station-13/upstream-merge-35170
[MIRROR] Add whiteship dock to space ruin code
|
2018-01-31 04:14:40 -06:00 |
|
CitadelStationBot
|
e18152dbff
|
Automatic changelog generation for PR #5220 [ci skip]
|
2018-01-31 04:14:30 -06:00 |
|
LetterJay
|
391e317451
|
Merge pull request #5220 from Citadel-Station-13/upstream-merge-35113
[MIRROR] Morgue and Crematorium Repositions
|
2018-01-31 04:14:27 -06:00 |
|
CitadelStationBot
|
26b8590b93
|
Automatic changelog generation for PR #5218 [ci skip]
|
2018-01-31 04:13:08 -06:00 |
|
LetterJay
|
37d0ad44cd
|
Merge pull request #5218 from Citadel-Station-13/upstream-merge-35127
[MIRROR] Redone Coffin Icons (Dikembe Mutombo Edition)
|
2018-01-31 04:13:05 -06:00 |
|
CitadelStationBot
|
07aed08acc
|
Automatic changelog generation for PR #5216 [ci skip]
|
2018-01-31 04:12:47 -06:00 |
|
LetterJay
|
527e6545e2
|
Merge pull request #5216 from Citadel-Station-13/upstream-merge-35081
[MIRROR] Potato battery nerf
|
2018-01-31 04:12:45 -06:00 |
|
LetterJay
|
758a4170c8
|
Merge pull request #5214 from Citadel-Station-13/upstream-merge-35103
[MIRROR] Adds client version to ingame reporting
|
2018-01-31 04:12:26 -06:00 |
|
CitadelStationBot
|
12f2fba555
|
Automatic changelog generation for PR #5213 [ci skip]
|
2018-01-31 04:12:14 -06:00 |
|
LetterJay
|
903a89e281
|
Merge pull request #5213 from Citadel-Station-13/upstream-merge-35045
[MIRROR] Turrets now check borgs!
|
2018-01-31 04:12:11 -06:00 |
|
LetterJay
|
cfcef963ad
|
Merge pull request #5189 from Citadel-Station-13/upstream-merge-35080
[MIRROR] Recompile runtime condenser with compile time optimizations
|
2018-01-31 04:07:49 -06:00 |
|
CitadelStationBot
|
a2dbeddc45
|
Automatic changelog generation for PR #5184 [ci skip]
|
2018-01-31 04:07:40 -06:00 |
|
LetterJay
|
7ac807afa6
|
Merge pull request #5184 from Citadel-Station-13/upstream-merge-34849
[MIRROR] Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC
|
2018-01-31 04:07:37 -06:00 |
|
CitadelStationBot
|
e5ff58dc30
|
Automatic changelog generation for PR #5182 [ci skip]
|
2018-01-31 04:06:59 -06:00 |
|
LetterJay
|
5ff485d4bf
|
Merge pull request #5182 from improvedname/packs
Adds kinkmate refill packages to cargo
|
2018-01-31 04:06:57 -06:00 |
|
LetterJay
|
3dc5dc2974
|
Merge pull request #5181 from Citadel-Station-13/upstream-merge-35003
[MIRROR] Makes the asset cache faster
|
2018-01-31 04:06:43 -06:00 |
|
CitadelStationBot
|
6d80a2e7bd
|
Automatic changelog generation for PR #5177 [ci skip]
|
2018-01-31 04:05:47 -06:00 |
|
LetterJay
|
32256336b3
|
Merge pull request #5177 from deathride58/mycomputerisapotato
Moves toggle animal digestion button to object tab
|
2018-01-31 04:05:45 -06:00 |
|
CitadelStationBot
|
be3f9ce707
|
Automatic changelog generation for PR #5171 [ci skip]
|
2018-01-31 03:03:20 -06:00 |
|
LetterJay
|
fb5125bd16
|
Merge pull request #5171 from Citadel-Station-13/upstream-merge-35027
[MIRROR] Adds cloning data disks to techwebs
|
2018-01-31 03:03:15 -06:00 |
|
CitadelStationBot
|
1a1c4a1347
|
Automatic changelog generation for PR #5169 [ci skip]
|
2018-01-31 03:03:07 -06:00 |
|
LetterJay
|
0b50addb85
|
Merge pull request #5169 from improvedname/Kinky
Adds shockcollars to the kinkmate for a price of one coin
|
2018-01-31 03:03:04 -06:00 |
|
CitadelStationBot
|
aacc131bae
|
Automatic changelog generation for PR #5168 [ci skip]
|
2018-01-31 03:02:50 -06:00 |
|
LetterJay
|
3fa1dbb721
|
Merge pull request #5168 from Zna12/Cargo-ORM-Security
Cargo orm security
|
2018-01-31 03:02:48 -06:00 |
|
CitadelStationBot
|
c8a37fe57e
|
Automatic changelog generation for PR #5164 [ci skip]
|
2018-01-31 03:02:34 -06:00 |
|
LetterJay
|
9a24afb8a4
|
Merge pull request #5164 from Citadel-Station-13/upstream-merge-34950
[MIRROR] Readds bz canisters to cargo order packs
|
2018-01-31 03:02:31 -06:00 |
|
LetterJay
|
eb49ebcce5
|
Merge pull request #5158 from Citadel-Station-13/upstream-merge-35073
[MIRROR] Fixes bad APC name on Boxstation
|
2018-01-31 03:02:19 -06:00 |
|
LetterJay
|
a45e8527db
|
Merge pull request #5121 from Citadel-Station-13/upstream-merge-34935
[MIRROR] OH GOD HOW DID THE MAPS GET SMALLER?
|
2018-01-31 03:02:10 -06:00 |
|
CitadelStationBot
|
eca7912c6a
|
Add whiteship dock to space ruin code
|
2018-01-31 03:00:55 -06:00 |
|
Tad Hardesty
|
62c9be914e
|
Add whiteship dock to space ruin code (#35170)
|
2018-01-31 03:00:54 -06:00 |
|
CitadelStationBot
|
87df04d3f0
|
Automatic changelog generation for PR #5212 [ci skip]
|
2018-01-31 03:00:40 -06:00 |
|
LetterJay
|
b450d5bce1
|
Merge pull request #5212 from Citadel-Station-13/upstream-merge-34951
[MIRROR] Heartless humans now display as unsuitable for abductor experiments
|
2018-01-31 03:00:38 -06:00 |
|
CitadelStationBot
|
3d67efdfe9
|
Automatic changelog generation for PR #5211 [ci skip]
|
2018-01-31 03:00:27 -06:00 |
|
LetterJay
|
198677b4cf
|
Merge pull request #5211 from Citadel-Station-13/upstream-merge-35116
[MIRROR] Cleans up wirer code.
|
2018-01-31 03:00:24 -06:00 |
|
CitadelStationBot
|
c1db81da0d
|
Automatic changelog generation for PR #5209 [ci skip]
|
2018-01-31 03:00:11 -06:00 |
|
LetterJay
|
48e5a3be80
|
Merge pull request #5209 from Citadel-Station-13/upstream-merge-35149
[MIRROR] [s] Reverts smoke and foam buffs, disable foam combining
|
2018-01-31 03:00:07 -06:00 |
|
LetterJay
|
e6574a34f6
|
Merge pull request #5208 from Citadel-Station-13/upstream-merge-35069
[MIRROR] Removes Tech-Disk Exports
|
2018-01-31 02:59:37 -06:00 |
|