 Putnam
|
12b879c777
|
oh yeah xenos had handle_changeling (??)
|
2020-09-07 03:28:39 -07:00 |
|
|
Timothy Teakettle
|
b3c459c59c
|
okay you can use any emote
|
2020-08-27 21:04:36 +01:00 |
|
|
LinandGitHub
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
|
Timothy Teakettle
|
8d9c94c087
|
aliens can remove embeds now
|
2020-07-27 17:59:05 +01:00 |
|
|
silicons
|
b20e3bc2b6
|
monkey attacks
|
2020-07-23 16:30:27 -07:00 |
|
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
|
Ghommie
|
e3b1ca4942
|
Linter.
|
2020-07-03 19:57:38 +02:00 |
|
|
Ghommie
|
bde80eb1fb
|
Fixing obscured inventory slots (un)equip block, for real.
|
2020-07-03 19:02:20 +02:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
|
LinandGitHub
|
2cd18f3dba
|
Merge pull request #12557 from silicons/life
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
|
2020-06-21 18:32:58 -05:00 |
|
|
Ghommie
|
48c13fcc10
|
Removing now unused old embed behavior
|
2020-06-20 00:15:52 +02:00 |
|
|
kevinz000
|
445d94f335
|
haha whew
|
2020-06-17 21:32:10 -07:00 |
|
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
|
Timothy Teakettle
|
7fbfb4ad0e
|
Merge remote-tracking branch 'upstream/master' into embed-changes
|
2020-06-15 22:48:26 +01:00 |
|
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03:00 |
|
|
kevinz000
|
433bd1af79
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-27 18:11:15 -07:00 |
|
|
Ghommie
|
841bb86181
|
Fixing blindness stuff.
|
2020-05-25 16:10:25 +02:00 |
|
|
kevinz000
|
e4eb49050c
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-24 15:03:06 -07:00 |
|
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
|
GhomandGitHub
|
9eccef2836
|
Porting "Personal interaction messages to simple animals" and more. (#12268)
* Porting "Personal interaction messages to simple animals" and more.
* Travis check.
* doc
* whoopsie.
* )
|
2020-05-18 04:46:57 -07:00 |
|
|
GhomandGitHub
|
75dec8ce2c
|
Ports "Removes the absolute istype fest from footsteps" (#12259)
* Ports "Removes the absolute istype fest from footsteps"
* Update species.dm
|
2020-05-18 04:46:22 -07:00 |
|
|
LinandGitHub
|
0d92783a91
|
oops. (#12242)
|
2020-05-14 00:22:57 +02:00 |
|
|
Artur
|
dabdf16eac
|
Coonflict fiiixeeess
|
2020-05-13 12:56:17 +03:00 |
|
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
|
Putnam
|
86afd889f1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-12 22:39:32 -07:00 |
|
|
LinandGitHub
|
fd30edca9c
|
infinixeno (#12234)
|
2020-05-13 03:18:25 +02:00 |
|
|
Putnam
|
e8d7da56f4
|
Ported C++mos from yogs (help me)
|
2020-05-11 15:44:26 -07:00 |
|
|
Ghommie
|
a412e840f7
|
'mob_run_block' and 'mob_check_block' macros
|
2020-05-08 18:52:32 +02:00 |
|
|
kevinz000
|
f034c7c536
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-05 17:38:43 -07:00 |
|
|
LinandGitHub
|
19f89ed1ba
|
Merge pull request #12022 from Ghommie/Ghommie-cit711
organ/on_life tweaks.
|
2020-04-29 01:15:02 +00:00 |
|
|
GhomandGitHub
|
858c697acc
|
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
|
2020-04-26 14:03:15 +02:00 |
|
|
Ghommie
|
8440b48a9a
|
organ/on_life tweaks.
|
2020-04-25 16:19:43 +02:00 |
|
|
Artur
|
f97f264fb7
|
Fixing more stuff
Mint machine compile fixes and the syndicate contractor program.
|
2020-04-23 20:09:42 +03:00 |
|
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
|
kevinz000
|
5984fa02b8
|
more changes
|
2020-04-22 08:49:21 -07:00 |
|
|
kevinz000
|
d259519bff
|
changes
|
2020-04-22 08:31:09 -07:00 |
|
|
kevinz000
|
0eac988f52
|
okay!
|
2020-04-22 08:22:52 -07:00 |
|
|
GhomandGitHub
|
bceca18626
|
Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
you can no longer knock out xenomorphs by punching them in the face i guess
|
2020-04-16 19:04:16 +02:00 |
|
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
|
Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|