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 |
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01: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 |
|
Artur
|
765ffdb1a1
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-26 14:03:27 +03: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 |
|
Timothy Teakettle
|
97dbd9cedf
|
better customization
|
2020-06-24 21:44:48 +01:00 |
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
silicons
|
cfc4a4d631
|
Update say.dm
|
2020-06-24 08:27:59 -07: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 |
|
Ghommie
|
ae053a9a08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
|
2020-06-23 03:12:49 +02:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Artur
|
a02e6ab03e
|
Compile
|
2020-06-22 21:30:54 +03:00 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03: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 |
|
Timothy Teakettle
|
0d197e82f8
|
Merge branch 'master' into cool-ipcs
|
2020-06-19 01:57:02 +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 |
|
Artur
|
92a60d6e68
|
Makes it actually work
|
2020-06-17 17:37:03 +03:00 |
|
Artur
|
7055e6c47a
|
Ports https://github.com/tgstation/tgstation/pull/51585
|
2020-06-17 17:07:42 +03:00 |
|
Trilbyspaceclone
|
51da7dfa71
|
Merge branch 'master' into spike-loot-differentces
|
2020-06-17 02:36:52 -04: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 |
|
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 |
|