Commit Graph

2336 Commits

Author SHA1 Message Date
datlo 9f2cd63ea5 Adds the poison pen to the Librarian syndicate items
Adds the Librarian to the list of jobs that can buy the poison pen.

It fits the role, and I figure the librarian, as a role with no special
tools or access, could use the love.
2018-08-24 17:46:54 +01:00
Crazy Lemon 195e199552 Merge pull request #9061 from Anasari/TGRefundPort
Port over Fox's refactored syndicate item refund from TG.
2018-08-22 22:51:12 -07:00
Crazy Lemon f14df8dfbb Merge pull request #9219 from Aurorablade/BORKBORK
Limits Dogs from Lycancoughy virus
2018-08-22 22:46:54 -07:00
Kyep f36468b865 comments, cleanup 2018-08-16 02:11:20 -07:00
Kyep c1c98e46ef failure messages, depot outgoing redspace portal 2018-08-16 00:57:59 -07:00
Kyep 02c836c8d1 Merge remote-tracking branch 'ParadiseSS13/master' into teleport_fixes 2018-08-16 00:27:40 -07:00
Crazy Lemon 6a925fb205 Merge pull request #8515 from Kyep/depot
Reworks Syndicate Supply Depot
2018-08-07 09:34:02 -07:00
Kyep 1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Birdtalon 62cad49207 adds initial 2018-08-03 20:16:03 +01:00
Birdtalon 5bd4a2c125 fixes assigning virus name for Kingstons 2018-08-03 19:56:19 +01:00
Kyep 8dbbddf86e modifies do_teleport instead 2018-08-02 09:57:32 -07:00
Crazy Lemon 2df8436495 Merge pull request #9277 from datlo/SyndiHardsuitFix
Updates syndi hardsuit description
2018-07-31 17:01:00 -07:00
Anasari b151aec3bc Fixes merge conflict 2018-07-31 14:31:14 +08:00
Crazylemon64 7b4dd7eb19 Cleans out various macro redefinitions or useless use of syntax 2018-07-30 23:24:35 -07:00
Anasari fb0cd5d94e Fixes & minor uplink items refactor 2018-07-31 13:37:24 +08:00
datlo 2775008140 Updates syndi hardsuit description 2018-07-29 15:25:23 +01:00
Crazy Lemon 19deae7157 Merge pull request #9270 from FreeStylaLT/how_uncrateful
[s] Fixes the plastic crate exploit
2018-07-28 12:12:41 -07:00
FreeStylaLT 5bfb03fd54 crate pun 2018-07-28 21:50:51 +03:00
FreeStylaLT 06d5410b3a all crate things must come to an end 2018-07-28 21:36:53 +03:00
Crazy Lemon 1d6c9225e7 Merge pull request #9247 from Fox-McCloud/abductor-update
Abductor update
2018-07-27 12:22:15 -07:00
Crazylemon64 cbd52db2be A couple buildmode fixes
The runtime when not placing a valid path is now replaced with a warning
message

The HUD icon for buildmode is no longer covered up by item actions
2018-07-26 21:47:40 -07:00
Fox McCloud fc89432b36 update 2018-07-25 00:31:57 -04:00
Crazylemon64 b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
Fox McCloud 89ec155432 Abductor Update 2018-07-24 19:49:10 -04:00
Fox McCloud ebe0b82bb0 Species Refactor Fixes 2018-07-23 01:28:58 -04:00
Aurorablade ae32772dae changes. 2018-07-22 22:53:03 -04:00
Crazy Lemon a5f2cb35cd Merge pull request #9223 from Fox-McCloud/what-is-this-species
Makes Species datum Non-Global
2018-07-21 17:01:33 -07:00
Fox McCloud e1419cbd86 Merge pull request #9207 from Crazylemon64/admin_speed_process
Adds an admin VV button to make any object speed process
2018-07-21 17:32:14 -04:00
Fox McCloud c6bb2ecd4d abductor stuff 2018-07-18 19:51:22 -04:00
Fox McCloud 7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud f075ef7836 wow, it works 2018-07-17 06:05:06 -04:00
Fox McCloud aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Citinited 82ce67b7d0 adds volume pumps back to the RPD 2018-07-17 08:22:50 +01:00
Fox McCloud 9c3fcaa53c AGHHHHHHHHHHHHH 2018-07-17 02:13:52 -04:00
Aurorablade cd9c0c847d Nueters Vulpakanin 2018-07-16 23:50:42 -04:00
Crazy Lemon 384fe93d33 Merge pull request #8975 from Citinited/rpd-refactor
RPD refactor
2018-07-16 14:22:38 -07:00
Citinited 29c6e6d69b A bunch of refactoring; RPD runtimes if a forbidden pipe is attempted to be dispensed; names loose disposals pipes 2018-07-16 00:23:03 +01:00
Fox McCloud 3610e17706 final touch ups 2018-07-15 18:11:33 -04:00
Fox McCloud b2c8f051b1 Merge remote-tracking branch 'upstream/master' into camera-damage-refactor 2018-07-15 16:31:50 -04:00
Fox McCloud f931105aa2 re-add wires 2018-07-15 16:31:06 -04:00
Crazylemon64 5ad5b7382b Adds a var_edited update so it leaves fingerprints 2018-07-13 14:14:10 -07:00
Kyep fa89130c5c fixes naked outfit 2018-07-06 06:32:28 -07:00
Fox McCloud e05594f5b5 Ragin' Mages Spell Cast Fix 2018-07-01 16:45:44 -04:00
datlo ff591585c6 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2018-06-29 18:45:55 +02:00
Crazy Lemon 2707c022ec Merge pull request #9141 from R1f72r/Highfive
Change the High-five emote time frame from 2.5 seconds to 4 seconds
2018-06-28 11:10:08 -07:00
datlo 8a909e4da5 Clown Magboots V2
changed syndi description and fixed my accidental reverts sorry for the
commit spam I still stuck at github
2018-06-28 12:10:22 +02:00
datlo 0100f679b0 Revert "Clown Magboots V1"
This reverts commit 38d0c3652c.
2018-06-28 12:03:11 +02:00
datlo c7392d2d54 Revert "woops"
This reverts commit 06eeae5b06.
2018-06-28 12:03:06 +02:00
datlo 31ff0cd6e4 Revert "Revert "woops""
This reverts commit cab9162d18.
2018-06-28 11:42:06 +02:00
datlo cab9162d18 Revert "woops"
This reverts commit 06eeae5b06.
2018-06-28 11:40:21 +02:00