d4b3ea1a49
Merge pull request #5768 from Citadel-Station-13/upstream-merge-36059
...
[MIRROR] Adds rum and coke, corrects Cuba Libre recipe
2018-03-03 02:45:57 -06:00
d44bbfa029
Automatic changelog generation for PR #5767 [ci skip]
2018-03-03 02:45:45 -06:00
4162e8a144
Merge pull request #5767 from Citadel-Station-13/upstream-merge-36063
...
[MIRROR] Meth is not good for your brain
2018-03-03 02:45:43 -06:00
2d21191658
Merge pull request #5766 from Citadel-Station-13/upstream-merge-36061
...
[MIRROR] Fixes anchored radiation collectors in Pubby ESS
2018-03-03 02:45:23 -06:00
bf7a740136
Automatic changelog generation for PR #5765 [ci skip]
2018-03-03 02:45:15 -06:00
05b2492f81
Merge pull request #5765 from Citadel-Station-13/upstream-merge-36062
...
[MIRROR] White crayons no longer make gloves look latex
2018-03-03 02:45:13 -06:00
c168c1582e
[MIRROR] Speed up space wind by avoiding noop proc calls. ( #5763 )
...
* Speed up space wind by avoiding noop proc calls. (#36072 )
During times of high numbers of active turfs on station, this proc tends to cost more per turf then process_cell does, avoiding noops is really the only easy speed up opportunity i can see here unless i wanted to make a flag for rather or not experience_pressure_difference is called so only movables that override the default behavior (livings really) get the proc called on them
* Speed up space wind by avoiding noop proc calls.
2018-03-03 02:32:45 -06:00
516325d877
Adds rum and coke, corrects Cuba Libre recipe
2018-03-03 00:11:56 -06:00
19b24c40a8
Merge pull request #36059 from ShizCalev/cuba_libre
...
Adds rum and coke, corrects Cuba Libre recipe
2018-03-03 00:11:56 -06:00
e55a28aaf1
Meth is not good for your brain
2018-03-03 00:11:45 -06:00
ddc3d5223c
Merge pull request #36063 from Robustin/Methisbadmmmkay
...
Meth is not good for your brain
2018-03-03 00:11:45 -06:00
2d441c863e
Fixes anchored radiation collectors in Pubby ESS
2018-03-03 00:04:26 -06:00
b27fde9e2e
Merge pull request #36061 from ShizCalev/pubby-rad-collector-anchor
...
Fixes anchored radiation collectors in Pubby ESS
2018-03-03 00:04:25 -06:00
4cd98f790d
White crayons no longer make gloves look latex
2018-03-03 00:03:16 -06:00
67bd3b3d7e
White crayons no longer make gloves look latex ( #36062 )
...
* makes white crayons make white gloves, not latex
* mime subtype gloves
* Why didn't cobby think of this?
* makes mime crayons give latex gloves
2018-03-03 00:03:16 -06:00
cd02bc4cb5
Automatic changelog generation for PR #5753 [ci skip]
2018-03-02 23:37:43 -06:00
863585f477
Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440
...
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 23:37:41 -06:00
b185b97906
Update game_options.txt
2018-03-02 21:33:57 -05:00
143909a855
Update examine.dm
2018-03-02 21:32:07 -05:00
272d0e1caf
Update preferences_savefile.dm
2018-03-02 21:30:58 -05:00
616269a8f1
Update preferences_savefile.dm
2018-03-02 21:30:14 -05:00
797a35e5ad
Update preferences_savefile.dm
2018-03-02 21:29:45 -05:00
0b4cdc2e69
Update preferences.dm
2018-03-02 21:28:33 -05:00
02b9f290dd
Update traits.dm
2018-03-02 21:27:56 -05:00
16dc017835
[MIRROR] Pubby fixes ( #5683 )
...
* Pubby fixes
* fixes pubby mabye
* actually fixes Pubby. Also fixes missing wire near cryo
2018-03-02 20:08:55 -06:00
11f9344f3b
Automatic changelog generation for PR #5696 [ci skip]
2018-03-02 20:08:37 -06:00
091fedc72b
Adds Pump-Action Particle Blasters! ( #5696 )
...
* Adds pump action disablers and more!
* Fixes things, implements in a better way
2018-03-02 20:08:35 -06:00
fdd6b01354
[MIRROR] Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK) ( #5757 )
...
* Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK) (#35853 )
* Update all_nodes.dm
* Lowers lasers to 3K from 5K
* 10K -> 7.5K
* Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK)
2018-03-02 20:08:04 -06:00
86e5111822
Automatic changelog generation for PR #5758 [ci skip]
2018-03-02 20:07:41 -06:00
75b038511c
[MIRROR] Alternative PR to brass apples: Adds bronze sheets ( #5758 )
...
* Alternative PR to brass apples: Adds bronze sheets (#35874 )
* Adds bronze sheets
* nope!
* Alternative PR to brass apples: Adds bronze sheets
2018-03-02 20:07:39 -06:00
4392e071cc
Automatic changelog generation for PR #5750 [ci skip]
2018-03-02 20:06:37 -06:00
b198e943e9
[MIRROR] Rearranges cargo packs ( #5750 )
...
* Rearranges cargo packs
* update packs.dm
2018-03-02 20:06:35 -06:00
a4d69a6470
Automatic changelog generation for PR #5760 [ci skip]
2018-03-02 20:05:30 -06:00
59d61d5e0d
[MIRROR] [READY]Circuit balance ( #5760 )
...
* [READY]Circuit balance
* [READY]Circuit balance (#35931 )
* cooldowns, power cell,disks
* NUMBERS NUMBERS NUMBERS
* 1 8 9
* PR PR PR
* DESC DESCDSCDCC
* <br>
* GET ALL CONTENTS
* Update power.dm
* Update power.dm
* Update time.dm
2018-03-02 20:05:28 -06:00
7d9dbcd0c3
[MIRROR] [s] Where were you, the day cyberboss exposed the database password to all admins with a holder ( #5761 )
...
* Merge pull request #36104 from MrStonedOne/blamecyberboss
[s] Where were you, the day cyberboss exposed the database password to all admins with a holder
* [s] Where were you, the day cyberboss exposed the database password to all admins with a holder
2018-03-02 20:03:17 -06:00
42fa773aaf
[MIRROR] Fixes backup light rounding ( #5759 )
...
* Fixes backup light rounding - #36060
* Fixes backup light rounding
2018-03-02 18:42:19 -06:00
d4f08c37a7
[MIRROR] When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works. ( #5752 )
...
* Merge pull request #35966 from kevinz000/patch-452
When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works.
* When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works.
2018-03-02 18:36:39 -06:00
16fd0f274c
Automatic changelog generation for PR #5749 [ci skip]
2018-03-02 18:35:37 -06:00
8543df055d
[MIRROR] Add parallax sprites from RIS ( #5749 )
...
* Add parallax sprites from RIS (#36049 )
* Add files via upload
* Update parallax.dm
* Add parallax sprites from RIS
2018-03-02 18:35:35 -06:00
2ace78a313
Automatic changelog generation for PR #5748 [ci skip]
2018-03-02 18:35:23 -06:00
190c964234
[MIRROR] C4 logging now shows correct location ( #5748 )
...
* C4 logging now shows correct location (#36047 )
* makes c4 log correct location
* C4 logging now shows correct location
2018-03-02 18:35:21 -06:00
42fa43ee82
[MIRROR] Updates some old tips ( #5747 )
...
* Updates some old tips (#36009 )
* Corrects some out-of-date tips
* Update tips.txt
* Updates some old tips
2018-03-02 18:35:05 -06:00
4af200b789
Automatic changelog generation for PR #5746 [ci skip]
2018-03-02 18:34:47 -06:00
1437fb4bd4
[MIRROR] Fixes SCP-294 overlay problems ( #5746 )
...
* Fixes SCP-294 overlay problems
* recompiles tgui
2018-03-02 18:34:45 -06:00
17b48041a7
[MIRROR] Fixes NTNet scanner component ( #5743 )
...
* Fixes NTNet scanner component (#36036 )
* Fixes NTNet scanner component
2018-03-02 18:32:47 -06:00
92ce523043
Automatic changelog generation for PR #5741 [ci skip]
2018-03-02 18:32:34 -06:00
9c87deac06
New sprites and inhands for eguns and lasers! ( #5741 )
2018-03-02 18:32:32 -06:00
d0afd7aee8
Automatic changelog generation for PR #5742 [ci skip]
2018-03-02 18:32:14 -06:00
227b09860e
[MIRROR] Makes the assault pod docking port non-timid ( #5742 )
...
* Makes the assault pod docking port non-timid (#36045 )
* Makes the assault pod docking port non-timid
2018-03-02 18:32:12 -06:00
0a449af83e
Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 14:38:18 -06:00
LetterJay