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
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
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
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
kevinz000
fd076ec7bb
Update cleanbot.dm
2020-06-13 16:19:32 -07:00
kevinz000
86a07fffc3
line fix
2020-06-12 15:34:40 -07:00
kevinz000
f9c624ef80
based vorestation
2020-06-12 15:32:32 -07:00
Lin
bfe8ccdfb5
Merge pull request #11627 from kevinz000/combat_rework
...
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
deathride58
245bf750c7
fixes a pair of dos vectors. this is apparently a day -1 patch! ( #12511 )
2020-06-12 11:54:18 -07:00
Timothy Teakettle
34c9a2f821
part 4
2020-06-11 21:45:32 +01:00
Timothy Teakettle
38bf529f3c
a tonne of fixes
2020-06-11 20:18:36 +01:00
Timothy Teakettle
a8de357342
more simplemobs including slimes fit in pet carriers ( #12494 )
...
* make slimes small
* cockroaches/crabs/sloths
2020-06-11 05:43:40 -07:00
Timothy Teakettle
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
Timothy Teakettle
8ec5672b85
tonne of fixes
2020-06-10 21:14:08 +01:00
Timothy Teakettle
95b8cd3956
first port
2020-06-10 20:33:01 +01:00
kevinz000
cc51768223
Update emote.dm
2020-06-09 21:58:11 -07:00
kevinz000
1ca12319b2
Update say_vr.dm
2020-06-09 21:56:49 -07:00
kevinz000
d9b3161775
Update emote.dm
2020-06-09 10:53:10 -07:00
kevinz000
e9a8daf805
Update say.dm
2020-06-09 10:45:52 -07:00
kevinz000
9523a3c1b3
Update say_vr.dm
2020-06-09 10:45:00 -07:00
