Commit Graph

3586 Commits

Author SHA1 Message Date
Putnam3145 ac30079026 Make dust-on-leaving-area code less bad (#12110)
* Un-badcodes dusts_on_leaving_area.

* var/ not necessary

* Fixed the code to work

* help me
2020-05-06 17:03:53 +02:00
kevinz000 f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
Ghommie 001109cfcd About ready. 2020-05-05 20:58:44 +02:00
Ghommie f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie 643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Kraseo f760919108 actually makes your speed reset to normal once the status is gone rather then when you get hit again 2020-05-04 21:06:15 +02:00
Kraseo 3cf7fd5105 pleases the travis god 2020-05-04 18:47:57 +02:00
Kraseo c79ece7449 really surprised this wasn't done earlier 2020-05-04 18:30:27 +02:00
Ghommie 87389243e6 r p g skills WIP. 2020-05-04 17:30:15 +02:00
Ghommie 65899bf906 Removing cargo "paperwork" and a few other bloat packs. 2020-05-03 19:56:00 +02:00
Ghommie 76e1ee80b7 Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them" 2020-05-03 07:12:41 +02:00
kevinz000 8f29839dbf Runechat Port (#12065)
* A

* A

* Ports Runechat

* compile fix

* fuck

* maybe?

* will this work?

* PLEASE

* fix

* fuck this
2020-05-03 03:53:19 +02:00
kevinz000 d4e6fada75 Update mirage_border.dm (#12092) 2020-05-03 03:50:38 +02:00
kevinz000 3cb4ef24ba Merge pull request #12081 from Ghommie/Ghommie-cit716
Fixing some runtimes with kevinz skills and holodeck hotspots.
2020-05-02 15:55:10 -07:00
kevinz000 fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715
Fixing several reported issues.
2020-05-02 15:54:32 -07:00
Lin f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows
Electrochromatic (dim-on-demand) windows
2020-05-02 19:13:29 +00: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 c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
Ghom e7f455e7af makes the uranium mat three times less radioactive 2020-05-02 00:42:21 +02:00
Ghommie f62aaddb1d Fixing some runtimes with kevinz skills and holodeck hotspots. 2020-05-01 23:22:23 +02:00
Ghommie 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
Ghommie a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00
kevinz000 269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045)
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
2020-05-01 18:39:45 +02:00
Lin c4250a41d2 Merge pull request #12017 from kevinz000/skills
Implements a basic skill system + adds surgery skill
2020-04-30 17:39:21 +00:00
kevinz000 1e42f3a3b7 Merge pull request #12023 from Ghommie/Ghommie-cit712
Fixing riding layers for human/cyborgs.
2020-04-29 12:03:29 -07:00
TrilbySpaceClone 1191268430 kevs request 2020-04-27 07:34:23 -04:00
kevinz000 28da033111 fine 2020-04-26 17:37:27 -07:00
kevinz000 bf7962d8f9 wow lotsa effort huh 2020-04-26 03:36:09 -07:00
kevinz000 af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
kevinz000 464fcd02cd Merge remote-tracking branch 'citadel/master' into skills 2020-04-25 22:18:08 -07:00
kevinz000 d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
2020-04-25 17:05:38 -07:00
kevinz000 d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
2020-04-25 16:59:07 -07:00
kevinz000 36512938a0 Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
Adds nanite replication protocols to our techweb
2020-04-25 16:54:32 -07:00
kevinz000 da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
kevinz000 0bf1f1e34f Merge pull request #12010 from Ghommie/Ghommie-cit709
Porting some VV updates from tg.
2020-04-25 16:51:27 -07:00
kevinz000 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Lin 499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704
porting CEV-Eris pickweight procs.
2020-04-25 18:30:26 +00:00
Ghommie d2d5fda0e2 Fixing riding layers for human/cyborgs. 2020-04-25 16:54:17 +02:00
kevinz000 3625d88b47 fixes 2020-04-25 03:41:15 -07:00
kevinz000 866b3789ab ok 2020-04-25 01:54:26 -07:00
kevinz000 a362060d72 ok 2020-04-25 01:40:42 -07:00
kevinz000 5f46f301a6 ok 2020-04-25 01:21:03 -07:00
kevinz000 388224b576 ok 2020-04-25 01:20:57 -07:00
kevinz000 ec4a40fa37 ok 2020-04-25 01:05:12 -07:00
kevinz000 cce3bad0d6 okay 2020-04-25 00:58:12 -07:00
kevinz000 6c5d42b5f5 oh boy 2020-04-25 00:48:56 -07:00
Ghom 7b877eb9e0 Merge pull request #11832 from Seris02/storagewhitelist
adds extra functionality to storage whitelists
2020-04-25 02:50:56 +02:00
Ghommie 0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghom f01cb896e5 Apply suggestions from code review 2020-04-25 02:43:56 +02:00
Putnam 95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00