 Ghommie
|
447f416ca6
|
Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471
|
2019-12-16 19:10:07 +01:00 |
|
|
Ghommie
|
93fbc17428
|
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-16 17:58:50 +01:00 |
|
|
kevinz000
|
aa14713fdd
|
nerfs
|
2019-12-16 08:12:49 -07:00 |
|
|
kevinz000
|
b3ad352a96
|
stuff
|
2019-12-16 08:10:41 -07:00 |
|
|
Ghommie
|
9c5a66af67
|
Fixes AI being unable to talk through the holopad.
|
2019-12-16 15:58:10 +01:00 |
|
|
r4d6
|
51a17dff94
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:42 -05:00 |
|
|
r4d6
|
c291511ab6
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:35 -05:00 |
|
|
r4d6
|
bfbb6231a5
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:28 -05:00 |
|
|
r4d6
|
2d488bee52
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:21 -05:00 |
|
|
r4d6
|
3e86e2207e
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:07 -05:00 |
|
|
r4d6
|
21b7fb0759
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:22:58 -05:00 |
|
|
r4d6
|
7142894ce7
|
Make the boop louder.
|
2019-12-16 09:02:01 -05:00 |
|
|
r4d6
|
2e4187b7c8
|
Add a boop sound effect
|
2019-12-16 08:56:51 -05:00 |
|
|
r4d6
|
a4d6911324
|
Update code/modules/mob/living/carbon/carbon_defense.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 07:48:29 -05:00 |
|
|
r4d6
|
13aaebcd22
|
Update code/modules/mob/living/carbon/carbon_defense.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 07:48:22 -05:00 |
|
|
r4d6
|
e8d43dac87
|
Port boops and handshakes
|
2019-12-16 06:27:18 -05:00 |
|
|
Useroth
|
8151a1f3ff
|
Merged master into this branch.
|
2019-12-16 12:06:30 +01:00 |
|
|
kevinz000
|
f11ab5eb61
|
hm
|
2019-12-15 23:29:25 -07:00 |
|
|
kevinz000
|
80ffb13f06
|
bypass joblock
|
2019-12-15 23:24:43 -07:00 |
|
|
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 |
|