shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,183 Commits 5 Branches 0 Tags
57c829a2aab6dca828af5cdcf703dfd70f3be984
Commit Graph

283 Commits

Author SHA1 Message Date
deathride58
a0a3232360 [READY] Allows the supermatter's radiation collectors to produce research points in short bursts (#33916) 
* allows radiation collectors present on the station roundstart to generate research points

* fixes bitcoin production rate, fixes multitool not activating multitool_act properly

* adds sounds, adds hint text, makes all rad collectors created on the station z-level connect to rnd, and fixes multitools acting weird

* nerfs criticism, makes rad collectors simply check for techwebs and z-level each process instead of during initialization

* fixes compiling error, is_station_level
 2018-01-17 11:18:21 -06:00
Leo
2b4735ded0 Merge pull request #34384 from F-OS/patch-3 
Quality of life: Newly constructed APCS are unlocked
 2018-01-14 21:32:38 -06:00
AnturK
d44d3c3f26 Fixes potato cells missing wires (#34253) 2018-01-11 07:39:37 -06:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
Cruix
015c46cbae Removed some superfluous stack code (#34083) 2018-01-05 06:01:36 -06:00
ShizCalev
3d3f28e091 Fixes white power cables in DM (#34066) 2018-01-04 20:16:31 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
LetterJay
c914f14339 Merge pull request #4634 from Citadel-Station-13/upstream-merge-33985 
[MIRROR] Solar control fixes
 2018-01-02 15:46:35 -06:00
Dax Dupont
0ebd16f509 Solar control fixes (#33985) 
* Solar fixes

* Also removing the solcon-o icon
 2018-01-02 08:21:16 -06:00
LetterJay
f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay
b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
oranges
d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
duncathan salt
0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
LetterJay
bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181 
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
 2017-12-17 21:26:08 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Ashe Higgs
2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
e46811d210 Update cell.dm 2017-12-13 12:03:21 -05:00
Jordan Brown
129cd705d1 Correctly set description of nonstandard cells 2017-12-13 09:12:55 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58
0c7bc2f3fe Merge pull request #4292 from Citadel-Station-13/upstream-merge-33376 
[MIRROR] Flickering no longer enables emergency lights
 2017-12-10 03:07:54 +00:00
Jordan Brown
2029473a48 Merge pull request #33397 from Xhuis/em_light_fix 
Fixes emergency lights having infinite power, and replaces their magic number with a define
 2017-12-09 15:53:49 -06:00
Jordan Brown
7b9bcb37aa Merge pull request #33376 from Xhuis/patch-3 
Flickering no longer enables emergency lights
 2017-12-09 15:53:20 -06:00
Jordan Brown
8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00
oranges
dc2d191eba Merge pull request #33332 from AnturK/lightfix 
Fixes light breaking
 2017-12-06 16:20:31 -06:00
deathride58
3526d4045a Merge pull request #4214 from Citadel-Station-13/upstream-merge-33288 
[MIRROR] Fixes powernets
 2017-12-05 20:17:33 +00:00
oranges
4204c889ed Merge pull request #32964 from AutomaticFrenzy/patch/joules 
Measure energy values in joules
 2017-12-05 03:23:06 -06:00
AnturK
005c6dcb59 Fixes powernets (#33288) 2017-12-05 03:22:33 -06:00
deathride58
64aadb868e Merge branch 'master' into upstream-merge-33213 2017-12-04 21:39:30 +00:00
deathride58
84fe88153e merges #4208 2017-12-04 16:17:43 -05:00
deathride58
4d29723302 Update lighting.dm 2017-12-03 18:25:54 -05:00
deathride58
a95b5a2b91 Merge pull request #4171 from Citadel-Station-13/upstream-merge-33144 
[MIRROR] Fix turbine computer showing broken
 2017-12-03 23:20:40 +00:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
Matt Smith
a0cdca9e7c Fix turbine computer showing broken 2017-11-30 17:01:38 -06:00
Emmett Gaines
9601136df2 sm soundtweak (#33154) 2017-11-30 17:01:29 -06:00
deathride58
837779b683 Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025 
[MIRROR] Fixes Lord Singuloth hungering for more than he should
 2017-11-24 23:15:09 +00:00
Leo
541b8db684 Merge pull request #32985 from YPOQ/airlockfix 
Fixes AIs being unable to interact with unscrewed airlocks
 2017-11-24 14:11:39 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00