Commit Graph

5635 Commits

Author SHA1 Message Date
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
Artur
b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03: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
Timothy Teakettle
1406364889 fix emps 2020-06-04 15:25:56 +01:00
Timothy Teakettle
f2aa370506 make ipcs cool 2020-06-04 14:59:52 +01:00
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
TrilbySpaceClone
937731d77d fix and tested 2020-06-02 21:32:36 -04:00
TrilbySpaceClone
b62ef0f4e8 right... 2020-06-02 19:44:47 -04:00
ynot01
ab3799ae7a Ports cornrows hairstyles from yogstation (#12423) 2020-06-02 15:29:07 -07:00
Ghom
ea763df326 Photosynthesis element. (#12394)
* Photosynthesis element.

* element yaketi sax.

* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Lin
348885a58d Merge pull request #12382 from Ghommie/Ghommie-cit797
Slight simple mob boss improvements.
2020-05-31 15:22:23 +00:00
kevinz000
abc2b820a4 Update living_blocking_parrying.dm 2020-05-30 23:49:04 -07:00
kevinz000
5b6e797c4f desword adjustments 2020-05-30 23:43:05 -07:00
kevinz000
250d078596 that was easy 2020-05-30 23:14:02 -07:00
kevinz000
34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000
d832cb6526 fix 2020-05-30 22:43:23 -07:00
kevinz000
2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000
1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000
c613726c2a render 2020-05-30 22:05:19 -07:00
kevinz000
e6020ca22c variable render 2020-05-30 21:02:13 -07:00
kevinz000
0723399ed4 render 2020-05-30 20:55:33 -07:00
kevinz000
d47841ee54 documentation 2020-05-30 20:38:07 -07:00
kevinz000
e5c32c1746 changes 2020-05-30 20:11:18 -07:00
Ghommie
9a9e76664f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 22:47:13 +02:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
kevinz000
3251338d31 fix 2020-05-30 02:01:06 -07:00
kevinz000
519552cb78 more handling 2020-05-30 01:59:58 -07:00
kevinz000
1214c99a34 is this a good idea 2020-05-30 01:46:43 -07:00