Commit Graph

9471 Commits

Author SHA1 Message Date
Aronai Sieyes
07cb7850ce Merge pull request #10535 from SpaceVampire/Chess
Chessboard Holodeck TG-Style.
2021-06-02 16:03:06 +00:00
Nadyr
752123834b Merge pull request #2107 from CHOMPStationBot/upstream-merge-10518
[MIRROR] Ports musical instruments from /tg/
2021-06-02 02:54:38 -04:00
Nadyr
59fd206160 powder that makes you say yes 2021-06-02 00:34:43 -04:00
Nadyr
4fba3e19fb delete yw file conflicting with upstream music changes 2021-06-02 00:21:18 -04:00
Nadyr
9b16a6cd41 powder that makes you say yes 2021-06-01 23:36:59 -04:00
Nadyr
095156f9e4 powder that makes you say yes 2021-06-01 23:35:20 -04:00
Nadyr
6042b29b89 Merge pull request #2105 from CHOMPStationBot/upstream-merge-10409
[MIRROR] explo vender stuff
2021-06-01 23:09:30 -04:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master
explo vender stuff
2021-06-01 14:58:32 +00:00
Verkister
cc4b02ee77 Fixes belly inits for maintpreds/morphs
Maintpreds and morphs now spawn with their provided vorgans without getting the vorepanel to replace it with an incomplete set of the char slot vorgans.
2021-06-01 11:10:25 +03:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00
Nadyr
b08be80408 Merge pull request #2088 from CHOMPStationBot/upstream-merge-10412
[MIRROR] Adds gender TF chemicals + Spontaneous TF pref
2021-05-31 03:45:32 -04:00
Nadyr
366fd4f97b Merge pull request #2086 from CHOMPStationBot/upstream-merge-10479
[MIRROR] Ports Runechat
2021-05-31 03:11:13 -04:00
Nadyr
a3f4c8247a Merge pull request #2087 from CHOMPStationBot/upstream-merge-10450
[MIRROR] Allow multiple SStranscore databases
2021-05-31 02:49:34 -04:00
Nadyr
e6ab787398 Merge pull request #2071 from CHOMPStationBot/upstream-merge-10488
[MIRROR] [MIRROR] Make figurines small instead of normal sized
2021-05-30 21:40:18 -04:00
Chompstation Bot
a0e3679020 Adds gender TF chemicals + Spontaneous TF pref 2021-05-30 23:00:43 +00:00
Aronai Sieyes
9134933442 Allow multiple SStranscore databases (#10450)
* Allow multiple SStranscore databases

* Add key to backup implanter too

* Key passing tweak

* Fix issue Leshana spotted

* Add optimization Leshana spotted

* Fixxy more multitranscore bugs
2021-05-30 22:53:28 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
24c35497ff powder that makes you say yes 2021-05-29 22:20:06 -04:00
Novacat
bc43cc2c67 Merge pull request #10489 from VOREStation/upstream-merge-8109
[MIRROR] Misc Bits
2021-05-29 19:10:43 +00:00
Chompstation Bot
501f383da4 [MIRROR] Make figurines small instead of normal sized 2021-05-29 18:55:11 +00:00
Nadyr
92e1743b5c Merge branch 'master' into upstream-merge-10401 2021-05-27 22:40:15 -04:00
Nadyr
d20b48d2a3 powder that makes you say yes 2021-05-27 22:00:18 -04:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433
[MIRROR] [MIRROR] Linter Introduction + Cleanup
2021-05-27 21:35:05 -04:00
Chompstation Bot
d76e756e5f [MIRROR] Reverts recipe changes from Industrial Expansion 2021-05-27 17:17:01 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
d52c1e61e8 Aro shipself v3 2021-05-27 01:10:08 +00:00
Nadyr
d69d166f2a Merge pull request #2036 from CHOMPStationBot/upstream-merge-10430
[MIRROR] Add secret zlevels
2021-05-26 01:05:08 -04:00
Novacat
cb50662968 Merge pull request #10429 from Very-Soft/windowtintswitch
Replaces window tint button sprite
2021-05-26 01:45:08 +00:00
Chompstation Bot
04b2b0af70 Add secret zlevels 2021-05-26 01:44:00 +00:00
Novacat
de885495b6 Merge pull request #10406 from Screemonster/contranslocatorband
Removes contraband descriptor from translocators.
2021-05-24 05:29:56 +00:00
Nadyr
ab64d36f4c Merge pull request #2001 from CHOMPStationBot/upstream-merge-10382
[MIRROR] Add mapping units/beacons for explo
2021-05-23 23:05:44 -04:00
Nadyr
3beacb065e Merge pull request #2011 from CHOMPStationBot/upstream-merge-10398
[MIRROR] [MIRROR] Wall-mounted Geiger Counters
2021-05-23 23:05:11 -04:00
Nadyr
1d620113ef Merge pull request #2015 from CHOMPStationBot/upstream-merge-10396
[MIRROR] [MIRROR] Wall Locker Adjustments
2021-05-23 23:04:12 -04:00
Novacat
9f795e904f Merge pull request #10396 from VOREStation/upstream-merge-8093
[MIRROR] Wall Locker Adjustments
2021-05-24 02:50:17 +00:00
Chompstation Bot
2b3041e7b6 [MIRROR] Wall-mounted Geiger Counters 2021-05-23 22:27:56 +00:00
Novacat
53fae19217 Merge pull request #10391 from ShadowLarkens/rpd_fix
Fix only the first RPD ever interacted with working
2021-05-23 16:31:01 +00:00
Chompstation Bot
4d73aa5aca Add mapping units/beacons for explo 2021-05-22 21:48:00 +00:00
Novacat
5d69f8878d Merge pull request #10373 from ShadowLarkens/fix_vending
Initialize all vending products on server start & fix multiple food icons
2021-05-22 03:50:10 +00:00
Nadyr
67b36900c5 Merge pull request #1988 from CHOMPStationBot/upstream-merge-10342
[MIRROR] Adds some fennec treats
2021-05-21 19:00:34 -04:00
Nadyr
5f60a47e86 Merge pull request #1990 from CHOMPStationBot/upstream-merge-10368
[MIRROR] [MIRROR] Food 4 thought
2021-05-21 18:59:31 -04:00
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083
[MIRROR] Food 4 thought
2021-05-21 20:00:24 +00:00
Chompstation Bot
c4161dc8d0 Adds some fennec treats 2021-05-20 19:55:01 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels
Various qdel helpers
2021-05-20 19:05:42 +00:00
Nadyr
4764d593cb Merge pull request #1975 from CHOMPStationBot/upstream-merge-10339
[MIRROR] Ports the Baystation Pilot Helmets
2021-05-19 10:06:27 -04:00
Razgriz
faad3af89e Merge pull request #1973 from CHOMPStationBot/upstream-merge-10351
[MIRROR] [MIRROR] More Spawner Tweaks
2021-05-18 23:20:00 -07:00
Chompstation Bot
c4aaf54601 Ports the Baystation Pilot Helmets 2021-05-18 12:34:21 +00:00
Novacat
b98bab980f Merge pull request #10351 from VOREStation/upstream-merge-8082
[MIRROR] More Spawner Tweaks
2021-05-18 12:32:05 +00:00
Novacat
23d3beed44 Merge pull request #10344 from KillianKirilenko/kk-misc2
Explorer/Pilot ID & Locker Addons
2021-05-17 16:55:19 +00:00
Novacat
111cd2a1ad Merge pull request #10328 from klaasjared/pilot_fix
Pilot Headset Fix
2021-05-15 11:56:58 +00:00