cd0b6d2fdb
Dice icon name and desc change
2018-03-03 00:31:35 -06:00
fa81e27676
d ( #36046 )
...
Dice icon name and desc change
2018-03-03 00:31:35 -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
3690cf3309
Oops
2018-03-01 09:39:28 -06:00
9b29bb13da
Automatic changelog generation for PR #5697 [ci skip]
2018-02-28 23:53:31 -06:00
36b3e13c8c
Merge pull request #5697 from Michiyamenotehifunana/Great-Trigonometric-Sprite-Replacement
...
The Great Trigonometric Sprite Replacement, Phase 1!
2018-02-28 23:53:29 -06:00
0f077de273
Automatic changelog generation for PR #5733 [ci skip]
2018-02-28 19:42:05 -06:00
bbc261952e
[MIRROR] Medals now show the commendation text in the description. ( #5733 )
...
* Medals now show the commendation text in the description. (#36020 )
* Medals now show the commendation text in the description
* the user is now real
* Medals now show the commendation text in the description.
2018-02-28 19:42:03 -06:00
78708a3582
[MIRROR] Fix icon of black fancy table in editor ( #5735 )
...
* Fix icon of black fancy table in editor
* Fix icon of black fancy table in editor
2018-02-28 19:41:44 -06:00
b40980b0c1
[MIRROR] Fixes hidden node unlocking ( #5731 )
...
* Merge pull request #36013 from kevinz000/techwebs_hotfix_1
Fixes hidden node unlocking
* Fixes hidden node unlocking
2018-02-28 19:31:38 -06:00
0a384c0df9
Automatic changelog generation for PR #5734 [ci skip]
2018-02-28 19:30:43 -06:00
9b598e388c
[MIRROR] Fixes Cyborg Defib units ( #5734 )
...
* Fixes Cyborg Defib units (#36012 )
* Fixes Cyborg Defib units
* Update defib.dm
* Fixes Cyborg Defibs
make it check for a false, not a true
* Fixes Cyborg Defib units
2018-02-28 19:30:41 -06:00
56137e19d7
[MIRROR] Fixes missing wire on boxstation ( #5737 )
...
* Merge pull request #36011
Fixes missing wire on boxstation
* Fixes missing wire on boxstation
2018-02-28 19:30:28 -06:00
7d74ea4b98
Automatic changelog generation for PR #5727 [ci skip]
2018-02-28 09:51:02 -06:00
9c450bdca7
Merge pull request #5727 from jakeramsay007/BuffsandNerfs
...
Adjusting Prayer Beads to be more useful
2018-02-28 15:50:59 +00:00
8bb41bc345
Automatic changelog generation for PR #5730 [ci skip]
2018-02-28 09:50:13 -06:00
CitadelStationBot