827ddbeed9
species support
...
the robotic species now get the robotic_organism trait
2020-11-01 05:14:06 +01:00
ed08983b97
syscorruption framework
...
Adds a framework for systems corruption instead of toxins damage for use in synthetic species. No ways to deal / heal it yet, nor effects, or actual uses. Soon.
2020-11-01 04:56:31 +01:00
1baa3013b3
Merge pull request #13626 from zeroisthebiggay/GOD
...
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
2020-10-28 07:53:44 -07:00
0307884eab
Merge pull request #13627 from Ghommie/Ghommie-cit841
...
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
6d2028abb5
Merge pull request #13601 from timothyteakettle/critical-item
...
antagonistic items will no longer fail to be placed on you
2020-10-28 07:43:39 -07:00
a4196e567b
i told me there'd be balance issues
2020-10-27 22:35:27 -05:00
cf49e78d45
Merge remote-tracking branch 'upstream/master' into i-hate-mcolor
2020-10-27 22:12:55 +00:00
f49f72338f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841
2020-10-25 15:01:57 +01:00
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
626fcf0aeb
OOPS
...
FUCK
2020-10-25 05:36:59 -04:00
6577aaac91
FRUSTRATION
2020-10-25 05:30:06 -04:00
585208dda9
Update angel.dm ( #13621 )
2020-10-24 21:22:32 +02:00
f17bf787e7
render antennas
2020-10-23 20:19:25 +01:00
f778ec0199
yeah lets maybe render stuff
2020-10-22 01:33:53 +01:00
a9a4d00171
second qol
2020-10-22 00:08:33 +01:00
20854dd639
extra qol
2020-10-22 00:01:41 +01:00
4a3afae9d1
WHAT IF WE FIXED EVERYTHING IN ONE COMMIT
2020-10-21 23:59:15 +01:00
4afceebcc1
critical
2020-10-20 02:11:08 +01:00
5e780064c1
fixes and a toggle
2020-10-17 19:47:46 +01:00
fcd8fec815
Fixes an oversight and updates some defines ( #13558 )
2020-10-17 12:37:58 +02:00
f6b93a242c
Makes get_damaged_bodyparts use proper arguments ( #13570 )
...
* you're not being clever, you're being obfuscatory, stop this
* Made get_damaged_bodyparts use proper arguments
* Actually shouldn't have the arg
2020-10-17 11:44:15 +02:00
ca21572aa7
Fixes vamp shapeshifting a bit ( #13562 )
...
* fixes vamp shapeshifting a bit
Title. Buncha weird stuff happening.
* ghom's request
moves the check to ../bat/cast(), adds type safety
2020-10-17 11:39:58 +02:00
4fdacf0560
Porting putnams ventcrawling PR and Fix ( #13571 )
...
* Porting putnams rage
* And the bugfix
2020-10-17 11:39:25 +02:00
4f5465c39e
fixes
2020-10-17 01:00:04 +01:00
2c6e8fd87d
what if color was cool
2020-10-16 22:28:00 +01:00
a134bedd4c
Fixes subtle hotkey, adds subtler hotkey ( #13575 )
2020-10-16 17:22:35 +02:00
ea80867cda
Update legion.dm ( #13566 )
2020-10-15 11:48:12 +02:00
23bc1476ea
its real slime leg hours
2020-10-13 23:46:32 +01:00
78a9c61952
Makes dwarf text not check every replacement every time. ( #13346 )
...
* Makes dwarf text not check every replacement every time.
* Apply suggestions from code review
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-10-12 13:26:18 +02:00
2e6a7b321a
Update living_movement.dm
2020-10-11 23:04:34 -07:00
a5ace5ed3a
Merge pull request #13543 from zeroisthebiggay/tyrna
...
ports tg legion reworks, colossus now enrages against sand golems, and some minor sprite stuff with him too
2020-10-11 17:33:16 -07:00
29b7b49fe9
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
...
Robotic limbs 2 : Threshhold Boogaloo
2020-10-11 17:33:00 -07:00
8c22580c08
Update species.dm
...
consistent commenting even though it's not consistent anyway.
2020-10-11 14:35:59 -05:00
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05: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
313970000b
Merge pull request #13522 from silicons/async
...
Fixes the intermittent master controller lockups
2020-10-11 18:48:37 +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
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -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
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
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +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
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
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
04db791004
Update human.dm ( #13491 )
2020-10-10 11:57:35 +02:00
DeltaFire