Commit Graph

105 Commits

Author SHA1 Message Date
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
LetterN
0b7e514739 t 2021-09-19 14:05:28 +08:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
WanderingFox95
e709d5cf0c More code. Shouldn't break anything.
We'll see if it does.
2021-06-22 13:35:37 +02:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Artur
3737c52df8 Funny actions 2021-01-20 15:23:34 +02:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
silicons
d4f94724ec Update plushes.dm 2020-12-27 10:51:44 -07:00
silicons
798b1b50f4 Update plushes.dm 2020-12-27 10:38:07 -07:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
DeltaFire
178be2b643 fixes plushlings
This makes it so the snowflake id is actually set if the plush is a snowflake, and also makes plushlings not become invisible anymore if they absorb a snowflake plush
2020-09-25 23:41:18 +02:00
DeltaFire
bd183e8e28 removes an unneeded check 2020-09-13 13:27:57 +02:00
DeltaFire
8975b93b37 no petting and not petting at the same time 2020-09-13 03:43:31 +02:00
DeltaFire
2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
Cameron!
e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
Navier
fc70d3dde2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG 2020-08-15 23:13:41 -04:00
Iatots
b6437a4ada Update code/game/objects/items/plushes.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-07-24 15:23:11 +02:00
Iatots
ec2bd9b876 Update plushes.dm 2020-07-24 08:40:25 +02:00
Iatots
b2a0d00eee Update plushes.dm 2020-07-23 21:13:41 +02:00
Iatots
80f2766314 Update plushes.dm 2020-07-23 20:11:29 +02:00
Strazyplus
15470de825 Don't DragON me, mister!
Removes comments from code
Removes mentions of Navier
Why are we still here? Just to suffer?
2020-07-13 07:01:48 -04:00
Strazyplus
92a6d673ba Drakes are dragons too 2020-07-12 07:32:09 -04:00
Strazyplus
2eb353d195 More License detail tweaks. 2020-07-12 00:56:43 -04:00
Strazyplus
582be67063 Lawyer-drake when?
unmodularized drakeborg
added licencing documentation
reduced / simpified code comments
2020-07-12 00:42:46 -04:00
Strazyplus
13fe156a8b Dragon online! 2020-07-11 21:32:34 -04:00
kevinz000
398651626d Update plushes.dm 2020-06-13 13:31:33 -07:00
kevinz000
6230e11f16 Update plushes.dm 2020-06-13 13:19:32 -07:00
kevinz000
278dfab74a Update plushes.dm 2020-06-13 13:10:14 -07:00
kevinz000
6f1dd34c91 Update plushes.dm 2020-06-13 11:57:11 -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
Akrilla
747be9cbe4 Better random plush spawning (#11792)
* better spawning

* check list size

* changes
2020-04-11 01:59:29 +02:00
kevinz000
e76eff6966 Update plushes.dm 2020-02-24 02:21:51 -07:00
kevinz000
27b7cd560c Update plushes.dm 2020-02-24 01:32:04 -07:00
Ghom
93310b8d4f can_random_spawn = FALSE for icon-less plushes 2020-01-23 19:42:21 +01:00
kevinz000
ccf66eb04a bools 2020-01-20 17:59:21 -07:00
kevinz000
7ace9f0203 abstract types 2020-01-10 06:25:23 -08:00
kevinz000
a16a7a7fe0 subtypes 2020-01-10 06:12:03 -08:00
kevinz000
976c725de2 ok fermis stays 2019-12-23 18:32:08 -08:00
kevinz000
fb77d07d52 plushies woohoo 2019-12-23 16:56:43 -08:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
YakumoChen
5c89447cf9 Update plushes.dm 2019-11-16 09:56:57 +00:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000
a16219d97a Merge pull request #9772 from DeltaFire15/weh
Adds eight new plushies to the game while integrating kevs' plush PR
2019-11-12 23:56:01 -07:00