 kevinz000
|
78e9b82eb6
|
trying too hard
|
2019-12-15 23:03:44 -07:00 |
|
|
kevinz000
|
57748fcdc8
|
changes
|
2019-12-15 22:28:41 -07:00 |
|
|
kevinz000
|
932bdfd325
|
kay
|
2019-12-15 21:57:22 -07:00 |
|
|
kevinz000
|
ba7a3f5fd2
|
Merge pull request #9971 from Xantholne/xantholne-christmas01
Adds the Christmas Clothes you never knew you wanted.
|
2019-12-15 20:11:09 -07:00 |
|
|
kevinz000
|
3b47949f82
|
haha fuck that's a lotta changes
|
2019-12-15 19:59:15 -07:00 |
|
|
kevinz000
|
5f27103641
|
god FUCK you icons
|
2019-12-15 17:30:30 -07:00 |
|
|
kevinz000
|
0190054c97
|
Update carbon.dm
|
2019-12-15 17:08:41 -07:00 |
|
|
Putnam3145
|
363380405e
|
Merge pull request #10198 from Ghommie/Ghommie-cit466
Fixes ranged syndicate mobs stormtrooper training: The port.
|
2019-12-15 15:42:13 -08:00 |
|
|
Ghommie
|
22aba489e3
|
Fixes ranged syndicate mobs stormtrooper training: The port.
|
2019-12-16 00:21:28 +01:00 |
|
|
Unknown
|
9bfba1d1d9
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-15 16:14:37 -07:00 |
|
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
|
kappa-sama
|
f8a05b5ae1
|
perhaps
|
2019-12-15 17:31:49 -05:00 |
|
|
Ghommie
|
80f47872d7
|
My head splodes.
|
2019-12-15 20:31:36 +01:00 |
|
|
kevinz000
|
8c27c176ca
|
move this..
|
2019-12-15 09:12:58 -07:00 |
|
|
kevinz000
|
db767d8ddf
|
bad idea
|
2019-12-15 00:37:34 -07:00 |
|
|
kevinz000
|
a4ffef5b1f
|
Typos
|
2019-12-15 00:36:20 -07:00 |
|
|
kevinz000
|
297c909b76
|
resting stuff
|
2019-12-15 00:29:18 -07:00 |
|
|
kevinz000
|
586dcb6f81
|
welp i got lazy
|
2019-12-15 00:15:32 -07:00 |
|
|
Putnam3145
|
2e9503f6d7
|
Merge pull request #10166 from Ghommie/Ghommie-cit457
Ports "Roundstart borg brains no longer decay."
|
2019-12-14 20:37:57 -08:00 |
|
|
Unknown
|
73abc2ae40
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-14 17:15:00 -07:00 |
|
|
Ghommie
|
3891c91799
|
virtual reality component improvements, fixes and documentation.
|
2019-12-14 17:19:48 +01:00 |
|
|
kevinz000
|
659b78d8b8
|
Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
|
2019-12-13 16:52:22 -07:00 |
|
|
Artur
|
9faf3d1dac
|
Mooaar fixeees
|
2019-12-14 01:01:38 +02:00 |
|
|
Ghommie
|
b39ae815f3
|
Porting several quirks code updates.
|
2019-12-13 16:12:04 +01:00 |
|
|
Ghommie
|
2611023488
|
Ports "Roundstart borg brains no longer decay."
|
2019-12-13 07:33:45 +01:00 |
|
|
nik707
|
cdeb4733aa
|
Merge pull request #9863 from BlackMajor/Yote
No adrenals for borgs please
|
2019-12-12 23:50:34 -06:00 |
|
|
Ghommie
|
c098d497ad
|
Minor underwear fixes and tweaks.
|
2019-12-13 06:50:14 +01:00 |
|
|
Ghommie
|
284202a092
|
two lines.
|
2019-12-13 02:37:51 +01:00 |
|
|
Ghommie
|
7d7bcc7c34
|
Fixes and ready up.
|
2019-12-13 02:30:21 +01:00 |
|
|
Ghommie
|
3fcb7808fd
|
args
|
2019-12-13 02:30:17 +01:00 |
|
|
Ghommie
|
8ec4bdaef5
|
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2019-12-13 02:30:11 +01:00 |
|
|
BlackMajor
|
83a707ee93
|
Removes medihounds, same treatment as janihounds
|
2019-12-13 13:48:22 +13:00 |
|
|
BlackMajor
|
725414bd03
|
Merge pull request #9894 from Putnam3145/real-explosion-fix
[TESTMERGE] Explosion/bomb armor rework
|
2019-12-13 10:20:33 +13:00 |
|
|
Putnam3145
|
9234876ad1
|
Merge pull request #10156 from Ghommie/Ghommie-cit451
Fixing character setup preview icons.
|
2019-12-12 09:30:34 -08:00 |
|
|
Ghommie
|
3545f10137
|
Fixing character setup preview icons.
|
2019-12-12 17:04:14 +01:00 |
|
|
Linzolle
|
acffa683c9
|
clearer message?
|
2019-12-12 00:40:08 -06:00 |
|
|
kappa-sama
|
b89d04884e
|
indents oops
|
2019-12-11 17:23:00 -05:00 |
|
|
kappa-sama
|
2b8f81bca3
|
idk maybe
|
2019-12-11 17:22:14 -05:00 |
|
|
kappa-sama
|
be3439e461
|
idk maybe?
|
2019-12-11 16:57:06 -05:00 |
|
|
Ghommie
|
651370c5b4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2019-12-11 21:10:24 +01:00 |
|
|
Lin
|
9ec8458803
|
Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-12-10 23:52:31 +00:00 |
|
|
Seris02
|
dfc8a1dc73
|
fixes it
if it breaks I blame you again putnam
|
2019-12-11 03:08:52 +08:00 |
|
|
Ghommie
|
8ed21b47b6
|
Grammar and something.
|
2019-12-10 16:20:57 +01:00 |
|
|
Ghommie
|
19a3aca619
|
I fear for my powernet
|
2019-12-10 15:33:15 +01:00 |
|
|
BlackMajor
|
8817f04e19
|
Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
|
2019-12-10 11:18:55 +13:00 |
|
|
Putnam3145
|
ee65d93e5a
|
Merge pull request #10086 from Ghommie/Ghommie-cit441
Fixes AI core display I may have broken with my coding extravaganza.
|
2019-12-09 13:41:25 -08:00 |
|
|
Putnam3145
|
beddaa1a99
|
Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
|
2019-12-09 12:40:37 -08:00 |
|
|
kevinz000
|
1866276d38
|
wrong intent
|
2019-12-08 22:13:15 -07:00 |
|
|
kevinz000
|
0dc69942a9
|
Update carbon.dm
|
2019-12-08 22:08:29 -07:00 |
|
|
kevinz000
|
cd1cf1e1e3
|
Update carbon.dm
|
2019-12-08 22:01:50 -07:00 |
|