80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
fe1576583c
Update code/modules/vending/cola.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-16 15:01:16 -05:00
6365a430cc
Merge pull request #10208 from Ghommie/Ghommie-cit469
...
Fixes AI being unable to talk through the holopad.
2019-12-16 10:57:26 -08:00
1701811fb6
kay
2019-12-16 11:35:04 -07:00
d9cd90c3c5
Update supply.dm
2019-12-16 11:31:03 -07:00
447f416ca6
Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471
2019-12-16 19:10:07 +01:00
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
aa14713fdd
nerfs
2019-12-16 08:12:49 -07:00
b3ad352a96
stuff
2019-12-16 08:10:41 -07:00
9c5a66af67
Fixes AI being unable to talk through the holopad.
2019-12-16 15:58:10 +01:00
51a17dff94
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:42 -05:00
c291511ab6
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:35 -05:00
bfbb6231a5
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:28 -05:00
2d488bee52
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:21 -05:00
3e86e2207e
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:07 -05:00
21b7fb0759
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:22:58 -05:00
7142894ce7
Make the boop louder.
2019-12-16 09:02:01 -05:00
2e4187b7c8
Add a boop sound effect
2019-12-16 08:56:51 -05:00
b0e8fb42cd
AAAAA
2019-12-16 14:00:14 +01:00
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
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
e8d43dac87
Port boops and handshakes
2019-12-16 06:27:18 -05:00
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
05497bb392
Changes required to enable for maintenance protocols
...
All combat mechs that are special get their internals_access increased so the pilots of the deathsquad / nuke team can fix up their mechs without having to steal a robotics ID. Also removes engineering from being able to access mech internals, seems weird to have if only robotics is allowed to handle mechs, probably remnant of engineering robotics?
2019-12-16 11:25:11 +01:00
a784235e35
scanline
2019-12-16 02:05:52 -07:00
f11ab5eb61
hm
2019-12-15 23:29:25 -07:00
80ffb13f06
bypass joblock
2019-12-15 23:24:43 -07:00
78e9b82eb6
trying too hard
2019-12-15 23:03:44 -07:00
57748fcdc8
changes
2019-12-15 22:28:41 -07:00
4a68a5c33f
fixes combo text
2019-12-16 12:59:19 +08:00
932bdfd325
kay
2019-12-15 21:57:22 -07:00
9f71900052
oop
2019-12-15 23:29:01 -05:00
b6c9c73372
this cannot go wrong
2019-12-15 23:28:17 -05:00
b54c8a6a2a
Merge pull request #9736 from Citadel-Station-13/kevinz000-patch-113
...
I want to have a word with whoever wrote the original antagonist reputation proc
2019-12-16 03:20:38 +00:00
b4bd2cbb5c
Update preferences.dm
2019-12-15 20:20:04 -07:00
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
3b47949f82
haha fuck that's a lotta changes
2019-12-15 19:59:15 -07:00
843f4ed0da
FLAK
2019-12-16 02:44:58 +01:00
fb6b01a4ae
testing, further improvements. Tired.
2019-12-16 02:29:53 +01:00
74cc1ec547
Merge pull request #10177 from BlackMajor/FIST
...
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
491958475b
fixed
2019-12-15 18:48:50 -06:00
6a5a098458
Fixing the blood bank generator.
2019-12-16 01:43:21 +01:00
5f27103641
god FUCK you icons
2019-12-15 17:30:30 -07:00
0190054c97
Update carbon.dm
2019-12-15 17:08:41 -07:00
e08b5b814f
Update lighting.dm
2019-12-15 17:04:23 -07:00
e496b7c397
Update eyes.dm
2019-12-15 17:02:43 -07:00
ce5c42f323
Update good.dm
2019-12-15 17:02:00 -07:00
745297632d
Update lighting.dm
2019-12-15 16:59:09 -07:00
ea84526661
Update good.dm
2019-12-15 16:58:44 -07:00
762cd00a5f
Update eyes.dm
2019-12-15 16:55:56 -07:00
Ghommie