 silicons
|
d946998fb9
|
Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
adds deep beepsky lore to the game in the form of hats
|
2020-07-23 16:18:17 -07:00 |
|
|
Lin
|
8a25582c1c
|
Merge pull request #12850 from silicons/drag
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
|
2020-07-23 17:13:48 -05:00 |
|
|
silicons
|
03f0d76a8e
|
yeah ok
|
2020-07-23 13:23:45 -07:00 |
|
|
Timothy Teakettle
|
e4f0a84404
|
cut overlay
|
2020-07-23 19:33:26 +01:00 |
|
|
Timothy Teakettle
|
5463673831
|
fuck
|
2020-07-23 19:02:50 +01:00 |
|
|
Timothy Teakettle
|
673188bc7e
|
please show the hat
|
2020-07-23 18:57:24 +01:00 |
|
|
Timothy Teakettle
|
b18356c95d
|
requested changes
|
2020-07-23 18:47:34 +01:00 |
|
|
silicons
|
ec72015f4f
|
Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
|
2020-07-23 10:35:16 -07:00 |
|
|
silicons
|
dad3d38933
|
Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
|
2020-07-23 10:29:43 -07:00 |
|
|
Timothy Teakettle
|
f5ac0b5762
|
some fixes
|
2020-07-23 18:10:46 +01:00 |
|
|
Timothy Teakettle
|
2290823ace
|
fixes hat removal
|
2020-07-23 14:40:36 +01:00 |
|
|
silicons
|
697cef017b
|
Update living.dm
|
2020-07-22 23:43:57 -07:00 |
|
|
timothyteakettle
|
a5945d3dc2
|
slight zombie tweaking
|
2020-07-23 01:09:09 +01:00 |
|
|
timothyteakettle
|
a607130e3c
|
please compile
|
2020-07-22 16:24:35 +01:00 |
|
|
timothyteakettle
|
ed1e8c4221
|
support for masks
|
2020-07-22 15:43:58 +01:00 |
|
|
timothyteakettle
|
6a4264085c
|
woops 2: electric boogaloo
|
2020-07-22 00:17:03 +01:00 |
|
|
timothyteakettle
|
0706ac9d2a
|
woops
|
2020-07-22 00:14:26 +01:00 |
|
|
timothyteakettle
|
6891bff9d3
|
further emotes
|
2020-07-22 00:07:15 +01:00 |
|
|
Timothy Teakettle
|
5c88253f93
|
lots more hats
|
2020-07-21 22:58:13 +01:00 |
|
|
Timothy Teakettle
|
aea268548c
|
some fixes
|
2020-07-21 19:54:42 +01:00 |
|
|
Timothy Teakettle
|
0942b46796
|
more fashions
|
2020-07-21 18:43:58 +01:00 |
|
|
timothyteakettle
|
8e2c76db7c
|
two more
|
2020-07-21 16:42:59 +01:00 |
|
|
timothyteakettle
|
99a2068dd2
|
its cool and hip
|
2020-07-21 16:26:51 +01:00 |
|
|
silicons
|
1450b11b01
|
sigh
|
2020-07-20 21:37:44 -07:00 |
|
|
timothyteakettle
|
4daf71d99e
|
woo it works
|
2020-07-21 03:34:50 +01:00 |
|
|
timothyteakettle
|
47ff13c539
|
apply the overlay
|
2020-07-21 02:37:21 +01:00 |
|
|
timothyteakettle
|
1ed035e4a3
|
move
|
2020-07-21 02:29:41 +01:00 |
|
|
timothyteakettle
|
3e0403a7e9
|
BEEPSKY FASHION
|
2020-07-21 02:22:42 +01:00 |
|
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
|
Lin
|
f7355dde62
|
Merge pull request #12728 from silicons/vote
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
|
2020-07-20 18:17:45 -05:00 |
|
|
BlackMajor
|
f265b85d3b
|
Merge pull request #12810 from lolman360/master
service borg fix/tweak
|
2020-07-20 11:42:59 +12:00 |
|
|
Timothy Teakettle
|
1b99cb9201
|
everything has the bonesetter
|
2020-07-19 18:32:44 +01:00 |
|
|
Timothy Teakettle
|
ca6b289da6
|
fix tables and some minor thing
|
2020-07-19 17:49:22 +01:00 |
|
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
|
Lin
|
ba3dc6a73b
|
Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
|
2020-07-18 17:02:02 -05:00 |
|
|
Timothy Teakettle
|
345c5c593d
|
everyone but slimes can scar basically
|
2020-07-18 22:31:52 +01:00 |
|
|
Timothy Teakettle
|
f290050a78
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-18 22:02:24 +01:00 |
|
|
Timothy Teakettle
|
b184cfefc5
|
imagine allowing wound healing
|
2020-07-18 22:00:28 +01:00 |
|
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
|
Timothy Teakettle
|
fe79c53f04
|
bugfixes
|
2020-07-18 21:40:19 +01:00 |
|
|
Lin
|
e165524763
|
Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
removes tango dancing
|
2020-07-18 11:17:42 -05:00 |
|
|
lolman360
|
55ed77a89d
|
Update robot_modules.dm
|
2020-07-18 16:15:47 +10:00 |
|
|
lolman360
|
f84b044f34
|
Update robot_modules.dm
|
2020-07-18 16:05:57 +10:00 |
|
|
BlackMajor
|
f68962e9d3
|
This is a bad idea
|
2020-07-18 16:46:08 +12:00 |
|
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
|
timothyteakettle
|
8bb9b11922
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-18 01:26:41 +01:00 |
|
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
|
silicons
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
|
Timothy Teakettle
|
93b4570f8d
|
more changes
|
2020-07-17 23:23:47 +01:00 |
|
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|