5aff38597f
Revert "Revert "Revert "Revert "customizable eyes""""
...
This reverts commit d852aacb78
2020-10-11 17:11:01 +01:00
d852aacb78
Revert "Revert "Revert "customizable eyes"""
...
This reverts commit dedfdf224d
2020-10-11 16:55:07 +01:00
1f800064de
Revert "Revert "Merge branch 'master' into eye-sprites""
...
This reverts commit d3a042deaa
2020-10-11 16:55:00 +01:00
dedfdf224d
Revert "Revert "customizable eyes""
...
This reverts commit 9f3d745d80
2020-10-11 16:54:53 +01:00
b76b97fbe9
Revert "Revert "eyes""
...
This reverts commit 4526fef297
2020-10-11 16:54:50 +01:00
4526fef297
Revert "eyes"
...
This reverts commit 0c99b53c05
2020-10-11 16:54:12 +01:00
9f3d745d80
Revert "customizable eyes"
...
This reverts commit dc70d17a1e
2020-10-11 16:54:09 +01:00
d3a042deaa
Revert "Merge branch 'master' into eye-sprites"
...
This reverts commit b48f4b91e6dc70d17a1e
2020-10-11 16:54:05 +01:00
b650fa1761
Revert "finishing touches"
...
This reverts commit 05aef528d7
2020-10-11 16:54:01 +01:00
c770a90ccb
Revert "cleanup"
...
This reverts commit 1fc7d9a21e
2020-10-11 16:53:57 +01:00
8895560c4b
tweaks threshholds a bit
...
modifies the advanced prosthetics threshhold a bit:
25 > 20, still 5 mindamage.
2020-10-11 16:57:15 +02:00
0f7868546b
h m m
2020-10-11 16:28:40 +02:00
4f734f68a9
moves damage checks
...
title. Makes it harder to circumvent them.
2020-10-11 16:18:25 +02:00
36ac341e81
e
...
empty lastline moment
2020-10-11 15:45:07 +02:00
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
0c3020d4b8
Merge pull request #13349 from LetterN/git-updates
...
Updates git, travis, and build tests
2020-10-11 01:24:09 -07:00
70a18ac0e3
shh - this makes travis work ^w^
2020-10-11 15:58:54 +08:00
face07f532
Update supermatter.dm
2020-10-11 00:45:01 -07:00
ff937e249f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe
2020-10-11 03:14:02 -04:00
3e61ccb31a
Merge pull request #13545 from Citadel-Station-13/silicons-patch-10
...
It's time for HALLOWEEN!
2020-10-11 19:45:23 +13:00
313970000b
Merge pull request #13522 from silicons/async
...
Fixes the intermittent master controller lockups
2020-10-11 18:48:37 +13:00
8be9e0aaad
Merge pull request #13530 from Citadel-Station-13/silicons-patch-12
...
THROWING A CLOWN INTO THE SUPERMATTER ENGINE NOW RANDOMLY ADJUSTS ENERGY AND DAMAGE
2020-10-11 18:43:49 +13:00
d69e081b23
Merge pull request #13193 from Citadel-Station-13/silicons-patch-17
...
buffsi ntegrated circuit medium screens
2020-10-11 18:42:49 +13:00
92b88925de
Merge pull request #13542 from Citadel-Station-13/silicons-patch-15
...
removes gibbing (blobattack) sound from *blorble so it always plays the far nicer attackblob sound instead
2020-10-11 18:42:06 +13:00
bf7d68884b
Merge pull request #13510 from silicons/google
...
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
2020-10-11 18:39:10 +13:00
9e909095a8
Merge pull request #13015 from silicons/combat_rework_experimental
...
Combat v4: Redesigning Stamina, Sprint, Combat mode
2020-10-11 18:38:53 +13:00
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
a8315a69e2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe
...
# Conflicts:
# icons/mob/clothing/belt.dmi
# icons/obj/clothing/belts.dmi
2020-10-11 01:19:18 -04:00
283ce51bc2
Merge pull request #13544 from DeltaFire15/portal-wackyness-fix
...
Fixes a bunch of portal-related runtimes
2020-10-10 22:16:49 -07:00
d2ce6ca709
Merge pull request #13540 from TheObserver-sys/QoLPass
...
Service+Plumbing QoL Pass 1: Beakers, Belts, Plungers and Pipes
2020-10-10 22:04:49 -07:00
c3983ee55b
Merge pull request #13535 from Hatterhat/energy-sabres
...
[READY] Energy Sabers - an elegant esword skin for a more civilized age
2020-10-10 22:04:17 -07:00
792080ca3f
Merge pull request #13533 from shellspeed1/jambalya-
...
Face hugger jambalaya. Should be ready.
2020-10-10 22:02:46 -07:00
b2336f1140
Merge pull request #13527 from ArchieBeepBoop/rtg
...
Fully Upgraded Advanced RTG Machine Preset
2020-10-10 22:01:20 -07:00
737b6460af
Merge pull request #13497 from Zandario/species-refactor
...
Refactors some defines for easier Species Development
2020-10-10 22:00:49 -07:00
8b48cab574
Merge pull request #13233 from Hatterhat/za-hando
...
[READY] za hando - a pr about ling claws and punching shit
2020-10-10 21:59:05 -07:00
2919dfee2e
Merge pull request #13014 from Hatterhat/tendril-minimum
...
[REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear
2020-10-10 21:58:15 -07:00
c412358d4e
another typo
2020-10-11 03:58:38 +02:00
ef073167df
crepe
2020-10-10 21:39:45 -04:00
f4cfc6c1e0
Update holidays.dm
2020-10-10 16:47:03 -07:00
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
c5bb85d794
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 00:47:54 +02:00
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
4f5f56e68f
Merge pull request #13531 from DeltaFire15/quick-fix
...
Oops! Regenerate_bodyparts-edition
2020-10-10 15:33:59 -07:00
9990337f32
fixes a bunch of portal runtimes
...
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
2020-10-10 23:40:12 +02:00
285b26d35e
sex
2020-10-10 15:08:22 -04:00
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
d8b39bcc5f
Merge pull request #13405 from silicons/tracer
...
warp implant is now infinite use and now actually reverts your position to 10 seconds before in time rather than use a snowflake chemical to teleport you 5 seconds later
2020-10-10 11:02:30 -07:00
a1ccc31877
fuck you travis
2020-10-10 18:05:31 +01:00
641970f2c0
fixes two typos
...
yeah, I got those two wrong. Not anymore though.
2020-10-10 16:48:25 +02:00
Timothy Teakettle