silicons
9b7690d90c
Merge pull request #12633 from Ghommie/Ghommie-cit824
...
Few issues, solved.
2020-06-28 12:53:54 -07:00
silicons
abbbda15ef
Merge pull request #12637 from timothyteakettle/fixes-my-dumb-mistakes
...
fixes slime blood colour
2020-06-28 12:53:36 -07:00
Lin
f1aedce87b
Merge pull request #12621 from Citadel-Station-13/silicons-patch-6
...
fixes a few things with the new Life()
2020-06-28 13:36:55 -05:00
Timothy Teakettle
d6cfd957ad
fix shoes
2020-06-28 17:26:50 +01:00
Ghommie
65ffadaa18
Few issues, solved.
2020-06-28 04:51:02 +02:00
silicons
5c10370326
Merge pull request #12601 from Detective-Google/piggyback
...
piggyback carrying people is no longer comically slow
2020-06-27 14:54:44 -07:00
silicons
e51bee9649
Merge pull request #12607 from Detective-Google/cog-2
...
cog fixes round 2
2020-06-27 14:54:31 -07:00
silicons
45a6061958
Merge pull request #12596 from Ghommie/Ghommie-cit819
...
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
Ghom
58778f2e6e
Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck
...
slimes blood colour is their body colour
2020-06-27 22:14:17 +02:00
silicons
3c4d3791a4
Update life.dm
2020-06-26 17:21:20 -07:00
Timothy Teakettle
9c9868438c
some fixes
2020-06-26 22:49:43 +01:00
Timothy Teakettle
334d55bef3
add support for custom blood colours
2020-06-26 20:29:40 +01:00
Detective-Google
8998373241
Update code/modules/mob/living/living_mobility.dm
...
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-06-25 19:58:41 -05:00
Detective Google
ea5b155057
lying down now isnt random
2020-06-25 19:39:37 -05:00
Detective Google
5d99f68d8c
stinky panda goes in the box
2020-06-25 14:57:41 -05:00
Detective Google
a4c243331c
aeugh
2020-06-24 17:25:39 -05:00
Ghommie
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
Lin
b303c1ebdd
hm yes
2020-06-24 02:13:53 +00:00
Ghom
b69a31fef1
Merge pull request #12565 from timothyteakettle/some-small-fixes
...
two small fixes
2020-06-23 03:36:16 +02:00
Lin
a0a4007332
Merge pull request #12567 from Citadel-Station-13/kevinz000-patch-5
...
Slime color changing now has 65536 possible colors instead of 256
2020-06-21 19:37:54 -05:00
Lin
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
silicons
8cd81ff89b
Merge pull request #12488 from Ghommie/Ghommie-cit813
...
Porting Cargo small-order support, cargo goodies packs, beating vendors for loot/squish.
2020-06-21 14:10:45 -07:00
Lin
905d4ee74d
Merge pull request #12558 from Citadel-Station-13/kevinz000-patch-4
...
Drastically buffs punch hit chance
2020-06-20 18:44:17 -05:00
kevinz000
354cc7d0c7
Update jellypeople.dm
2020-06-19 19:31:38 -07:00
Ghommie
48c13fcc10
Removing now unused old embed behavior
2020-06-20 00:15:52 +02:00
Ghommie
29a8d2ed78
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813
2020-06-20 00:07:47 +02:00
Timothy Teakettle
a8f4988c36
alter form updates hair
2020-06-19 17:09:54 +01:00
Lin
3cdc73ff35
Merge pull request #12487 from kevinz000/erp_2
...
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
2020-06-18 13:37:10 -05:00
kevinz000
8a90590263
Update species.dm
2020-06-18 08:25:49 -07:00
kevinz000
291004d0fb
Update species.dm
2020-06-17 22:44:08 -07:00
kevinz000
78fadafa05
alright
2020-06-17 21:44:49 -07:00
kevinz000
409dbd2835
carbons and humans
2020-06-17 21:42:04 -07:00
kevinz000
1336404eb6
last ones
2020-06-17 21:37:19 -07:00
kevinz000
445d94f335
haha whew
2020-06-17 21:32:10 -07:00
kevinz000
118ac1a775
Merge pull request #12548 from timothyteakettle/more-events
...
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
Lin
46fdb476b5
Merge pull request #12482 from TheSpaghetti/patch-1
...
More insectoid insects (I accidentally ruined the first version of this, so I'm trying again.)
2020-06-17 20:03:25 -05:00
Timothy Teakettle
2229db2214
Merge branch 'master' into embed-changes
2020-06-17 16:40:34 +01:00
kevinz000
eb572c9d47
Merge pull request #12537 from timothyteakettle/ports-tipping-medibots
...
ports tipping medbots from tg
2020-06-17 08:35:50 -07:00
Timothy Teakettle
f054ae6288
appease our great linter overlord
2020-06-16 21:40:50 +01:00
timothyteakettle
b59c8c1af6
fix maps
2020-06-16 02:44:11 +01:00
Timothy Teakettle
eba1e8f301
fixes the merge conflicts
2020-06-15 23:29:49 +01:00
Timothy Teakettle
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
Timothy Teakettle
513a4e3d92
fixes udders more
2020-06-15 22:44:05 +01:00
Timothy Teakettle
1fe25ce420
fixes udders
2020-06-15 22:40:10 +01:00
Timothy Teakettle
d7bce8aec0
ports some events
2020-06-15 20:22:40 +01:00
Timothy Teakettle
6798699b18
slimes can change their body color using alter form ( #12509 )
...
* let slimes change their color!
* fix
* let them change hair colour
* Revert "let them change hair colour"
This reverts commit 561bc3d06733fcfee2bae5be819c5a3e57bfc89d.
2020-06-14 23:02:23 -07:00
Timothy Teakettle
1568c83837
Update medbot.dm
2020-06-14 21:58:50 +01:00
Lin
894e6c7459
Merge pull request #12502 from kevinz000/shaps_is_once_again_based
...
Port - Lets you tape knives to cleanbots. You know, if you really want to. #47590/tgstation/Ryll-Ryll
2020-06-14 14:37:10 -05:00
Lin
923cb248d2
Merge pull request #12515 from kevinz000/roomba
...
Zoombas
2020-06-14 14:36:03 -05:00
Timothy Teakettle
1c2366cc3d
update files to tgs
2020-06-14 18:16:01 +01:00
