Commit Graph
377 Commits
Author SHA1 Message Date
Blue Wildrose a625b1d770 Fixed drones nullspacing things they place on tables and in closets 2021-04-07 21:45:04 -07:00
Blue Wildrose f1ef779e58 Bumbles no longer has a number beside their name 2021-04-01 16:53:47 -07:00
Blue Wildrose 4de7af5db5 Bumbles no longer has a number beside their name 2021-04-01 16:31:15 -07:00
siliconsandGitHub 771809a6d0 Merge branch 'master' into async_2 2021-03-09 00:17:26 -07:00
silicons 37eaebe54a fix 2021-02-25 23:22:46 -07:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot 2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
silicons 3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Letter N 45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
raspy-on-osu f2d9643c75 init 2021-01-24 22:31:39 -05:00
raspy-on-osu 622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
raspy-on-osu 0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
siliconsandGitHub 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Timothy Teakettle f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Artur 3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Michiyamenotehifunana 0f274d5891 Fixes some code anomalies
Adds newline to possum code, reverts var invalidation in kilostation's pets
2020-08-10 09:40:23 +08:00
Michiyamenotehifunana 9b6156ad81 Ports opposums
Everything stolen from Desert Rose, including sprites. All credits to whoever made it there.
2020-08-09 16:35:12 +08:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
siliconsandGitHub 6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
Timothy Teakettle 29628dd82a cows 2020-07-12 21:40:16 +01:00
Timothy Teakettle c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
kappa-samaandGitHub a798061f71 also this 2020-07-09 16:14:38 -05:00
siliconsandGitHub 3f1119fcdb Merge pull request #12630 from Ghommie/Ghommie-cit822
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-07-02 01:44:59 -07:00
Ghommie a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
Detective Google 5d99f68d8c stinky panda goes in the box 2020-06-25 14:57:41 -05:00
kevinz000 78fadafa05 alright 2020-06-17 21:44:49 -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
timothyteakettle b59c8c1af6 fix maps 2020-06-16 02:44:11 +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 TeakettleandGitHub 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 TeakettleandGitHub 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 TeakettleandGitHub 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
GhomandGitHub e11908a357 Oranges and Paperwork can be picked up again. (#12351) 2020-05-25 14:20:10 -07:00
GhomandGitHub ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07:00
GhomandGitHub 9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268)
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
2020-05-18 04:46:57 -07:00
GhomandGitHub 75dec8ce2c Ports "Removes the absolute istype fest from footsteps" (#12259)
* Ports "Removes the absolute istype fest from footsteps"

* Update species.dm
2020-05-18 04:46:22 -07:00
Ghommie b5a4bceafb Fixing some sprite issues and nit-picks. 2020-05-06 17:46:15 +02:00
Ghommie 42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Winter Flare dc5c8fb657 Ups Crab Meat from 1 to 4 2020-04-19 17:00:48 -04:00
kevinz000andGitHub d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00