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
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
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
Timothy Teakettle
14c9ab2ff1
ports tgs regal rats ( #12479 )
...
* port regal rats
* fix missing line
* royal rat goes after humans too
* okay dont let them attack people
* let them attack people but at less damage
* remove header
2020-06-09 03:28:00 -07:00
Timothy Teakettle
3692323615
plushmium: the fermichem that creates sentient plushies ( #12450 )
...
* create plushie mob and chem
* better plush
* sentience
* fixes
* more fixes
* spelling error
* okay this works better
* more work on sentiency
* fixes
* further fixes
* revert plush storage changes, add splash effect
* fix icons
* undo a change that i guess isnt needed
* remove spaces
* plushies are now space immune
* make warning text more clear
* dont give them more health than bears?
* give them 0/1 stamina damage
* bugfix
* squeak when attacked
* small refactor
2020-06-09 03:21:18 -07:00
kevinz000
e3487b2adf
boy oh boy
2020-06-08 21:08:40 -07:00
Ghommie
a323fe01d3
This should be fine now.
2020-06-08 20:22:16 +02:00
Ghommie
c246e13693
Ok.
2020-06-08 19:15:51 +02:00
DeltaFire15
efddaa8cad
removes early return ( #12483 )
...
This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it.
2020-06-08 09:10:06 -07:00
kevinz000
b3afed69f4
huffles
2020-06-08 08:47:06 -07:00
Ghommie
ad6b835e8b
Linter.
2020-06-08 08:12:29 +02:00
TheSpaghetti
e4763b5f6e
let's try that again
...
more insectoid insects
2020-06-07 18:12:49 -04:00
kevinz000
92d1af5889
adjustments
2020-06-04 22:18:19 -07:00
kevinz000
bad809ffce
fixes
2020-06-04 19:56:06 -07:00
Trilbyspaceclone
0b0e9011a7
Prevent surgery tools and items from being rad contaminatable ( #12413 )
...
* Update tools.dm
* Update tools.dm
* Update robot_modules.dm
2020-06-04 15:56:15 -07:00
Yawet330
fabfd684ce
Silicon Flavortexts. (SCRUTINISE HEAVILY) ( #12395 )
...
* Part 1 - Adding the component
* Part 2 - Making the WRITE_FILE before changing the pref menu.
* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction
* Part 4 - Changes the preference tab to accomodate this.
* we made a brief fucky wucky!
* make it look noice
* fuckywucky mk2
* Part 5 - make it apart of the helper list (woops)
* that'yll do it.
* maybe fix?
* nope, just hit the delete button on their flavortext entirely :agony:
* Update preferences_savefile.dm
* Update silicon.dm
* Update preferences.dm
* Update silicon.dm
2020-06-04 15:53:39 -07:00
kevinz000
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
ynot01
ab3799ae7a
Ports cornrows hairstyles from yogstation ( #12423 )
2020-06-02 15:29:07 -07:00
