Commit Graph

79 Commits

Author SHA1 Message Date
kevinz000 7d46ed2bec Merge pull request #11282 from Ghommie/Ghommie-cit595
Yeets the preferences_vore datum and migrates its stuff to preferences.
2020-03-19 08:30:18 -07:00
kevinz000 88bb9d8f1d Update sword_point.dm (#11523) 2020-03-18 19:20:56 +01:00
Ghommie 5bfbcd0948 Fixing some GetElement runtimes. 2020-03-15 15:12:35 +01:00
kevinz000 395fa32136 Merge pull request #11447 from Ghommie/Ghommie-cit618
Porting datum components system updates.
2020-03-14 09:09:50 -07:00
Ghommie da5b293033 underscores. 2020-03-12 21:31:17 +01:00
Ghommie 663a849afe Makes the autotransfer subsystem a bit more optional. 2020-03-12 21:02:34 +01:00
Ghommie 8ccd0d2cbc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 2020-03-12 20:31:14 +01:00
Ghommie 0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000 fa160d4c3a Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3
Fixes flavor text preview on the chatbox.
2020-03-11 17:44:35 -07:00
Putnam3145 480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
Ghom 77bdb9afe8 Update flavor_text.dm 2020-03-11 17:15:04 +01:00
Ghommie 27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Ghom ddc7d5cf12 Update flavor_text.dm 2020-03-10 17:28:31 +01:00
Ghommie 7578d60436 flavor texts unset on randomize, yay. 2020-03-10 15:11:16 +01:00
Ghommie 7ba120a8d3 lazyor 2020-03-10 14:12:11 +01:00
Ghommie 17007182c9 Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604 2020-03-09 22:42:31 +01:00
Ghommie aa8dc93a5d locate textref. 2020-03-09 22:27:27 +01:00
Ghommie 0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
Ghom a139f0adc6 Update flavor_text.dm 2020-03-08 01:38:42 +01:00
Ghom 991f9a75b7 Update flavor_text.dm 2020-03-08 01:33:02 +01:00
Ghom d10f0b0e2f Update flavor_text.dm 2020-03-08 01:28:42 +01:00
Ghom ec0d0f9ada Update flavor_text.dm 2020-03-08 01:27:14 +01:00
Ghommie 5ae7965744 Ok. 2020-03-05 22:06:48 +01:00
Ghommie 324f75c4db Makes the thing actually work. 2020-03-05 21:41:41 +01:00
Ghommie 6de290758b Oh, yea. 2020-03-05 19:07:24 +01:00
Ghommie 2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
Ghom 7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
kevinz000 cbf2355f19 Update code/datums/elements/sword_point.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-03 21:06:05 -07:00
Lin 70e2563579 Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
2020-02-29 00:13:58 -06:00
kevinz000 93d91b1808 Merge remote-tracking branch 'citadel/master' into sword_point 2020-02-28 13:39:56 -07:00
kevinz000 8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
Ghommie 11f767d412 A couple mob holder oversights. Again? 2020-02-27 16:16:21 +01:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghom 9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
2020-02-24 16:39:16 +01:00
Hatterhat b89a2314a2 mmm that's compiling i don't like that 2020-02-22 16:17:51 -06:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghom e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
2020-02-21 02:43:04 +01:00
Ghom b028b296f5 Update mob_holder.dm 2020-02-17 12:17:33 +01:00
Ghom 3703110dda Makes the mob holder examine less dumb. 2020-02-16 16:10:20 +01:00
kevinz000 b46dd3246d Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4
/datum/element/cleaning cleans your face!
2020-02-15 12:16:39 -07:00
kevinz000 76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573
Further mob holder fixes.
2020-02-15 11:44:25 -07:00
Ghom 12b84aa333 Update mob_holder.dm 2020-02-12 12:43:47 +01:00
Ghommie e5ab230b26 Monky chokehold deluxe. 2020-02-12 09:32:38 +01:00
Ghommie e099ed9578 Further mob holder fixes. 2020-02-12 09:24:49 +01:00
kevinz000 58db43621d Merge pull request #10941 from Ghommie/Ghommie-cit561
Adds the ELEMENT_DETACH flag to two elements
2020-02-11 00:42:15 -07:00
Ghom 82e36846bc /datum/element/cleaning cleans your face! 2020-02-08 06:18:00 +01:00
Ghom bb140df39c Fixing mob holders 2020-02-08 04:04:16 +01:00
Detective Google f145b8c0b5 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-02-07 16:28:47 -06:00
Ghommie 16b655b887 Adds the ELEMENT_DETACH flag to two elements 2020-02-06 23:19:21 +01:00
kevinz000 18910a23a2 Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00