cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,846 Commits 10 Branches 0 Tags
990530d1189fc83a28c1446c9a07cfe3ba6c49f2
Commit Graph

372 Commits

Author SHA1 Message Date
Chinsky
e6f83f8fa2 Merge pull request #8707 from PsiOmegaDelta/Garbage 
Ports /vg/&/tg/'s garbage collector.
 2015-04-09 08:50:12 +03:00
PsiOmega
c305b389f7 Ports /tg/'s & /vg/'s garbage collector/object pool. 
It's happening. Kind of, the code is there.
 2015-04-02 14:48:28 +02:00
mwerezak
7366df388b Merge remote-tracking branch 'upstream/dev' into docking-update 2015-03-31 20:50:02 -04:00
volas
5fee41d4ba sanitize() refactor: third pass (misc) 2015-03-25 01:05:21 +03:00
mwerezak
2d3a767489 Allows mult-shuttles to use docking controllers and adds docking to the merc shuttle 2015-03-24 03:55:06 -04:00
mwerezak
014692269c Greatly simplifies docking initialization 2015-03-23 23:35:35 -04:00
Zuhayr
3718245e45 Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation. 2015-03-21 11:13:53 +10:30
Zuhayr
8d698f0c06 First pass on making heist a pirate mode (human based) 2015-03-21 11:13:05 +10:30
Zuhayr
4fdc00dee4 Working on gamemode/antagonist code. 2015-03-21 11:08:22 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
PsiOmega
7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
 2015-03-20 08:44:52 +01:00
PsiOmega
744ef41d8e Law Zero phrasing is now a config option. 
The default value is a non-objective phrasing. config.txt contains the default phrasing should it be desired.
 2015-03-17 14:47:32 +01:00
Chinsky
376657bdd7 Merge pull request #8353 from Glloyd/goonschedu 
Goon Process Scheduler for BS12
 2015-03-17 10:04:21 +03:00
PsiOmega
db3dddfff9 Makes it possible to debug the NanoUI manager. 
For debugging purposes.
 2015-03-16 22:27:31 +01:00
PsiOmega
fac4eb08e3 Alarm subsystem is now processed by the scheduler. Removes now dead code. 2015-03-13 10:36:47 +01:00
PsiOmega
6749e09ead Makes available ERT species a config option. 2015-03-08 15:45:52 +01:00
Graham Lloyd
160183ebd5 finishes work on adapting the goon process scheduler for BS12. 2015-03-04 05:14:36 -05:00
Zuhayr
586ab164f8 Merge pull request #8242 from PsiOmegaDelta/StarDimmer 
Makes starlight strength configurable.
 2015-02-26 16:28:09 +10:30
PsiOmega
d0aa773020 Makes starlight strength configurable. 2015-02-24 16:12:07 +01:00
Atlantiscze
488c25ae73 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-24 13:09:05 +01:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
Chinsky
b73d541c65 Merge pull request #8155 from PsiOmegaDelta/subsystems 
Centralized Alarm Handling
 2015-02-24 04:39:48 +03:00
PsiOmega
5578afa07c General update. 
NanoUI interface sorted.
Accessible by AI, borgs, and through consoles.
Automatic alarm resets in case of lost sources.
 2015-02-23 10:32:25 +01:00
PsiOmega
5023fa4000 Ports /tg/'s starlight luminance. 
Because configuration is initialized before the map we also don't have the same runtimes issues corrected by https://github.com/tgstation/-tg-station/pull/7806.
 2015-02-23 10:11:46 +01:00
Graham Lloyd
8364c3de2d Adds processes, next step is to replace them in the current MC and ticker 2015-02-19 05:09:35 -05:00
Graham Lloyd
3acfc51c45 initial commit for process scheduler 2015-02-18 04:23:41 -05:00
Atlantiscze
2d4926f72d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-17 16:05:47 +01:00
PsiOmega
ec4b8c78a1 Merge remote-tracking branch 'upstream/dev' into subsystems 
Conflicts:
	code/game/machinery/camera/camera.dm
	code/modules/mob/mob.dm
 2015-02-17 08:36:12 +01:00
PsiOmega
2e9c266a2f Basic main structure for centralized alarm handling. 2015-02-17 08:34:26 +01:00
Zuhayr
c953e279a4 Update from dev. 2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
mwerezak
b7e3a14e0d Fixes machines being usable after a power failure 
Fixes machines not gaining the NOPOWER flag after a power failure
because they were turned off and had use_power set to 0.
Fixes machines not gaining the NOPOWER flag after being moved into an
area with no power.

Both bugs allowed power using machines to be used in areas with no
power.
 2015-02-11 23:28:53 -05:00
Atlantiscze
12be20ed73 Mapping changes preparation 
- Adds Red and Blue simple pipes for mapping use.
- Adds empty CO2 PH and N2O canisters for mapping use.
- Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility
- Modifies engineering shuttle to work with next commit.
- SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power.
- Fixes SMES related bug caused by previous commit
 2015-02-09 18:53:02 +01:00
Zuhayr
c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
Zuhayr
5890fa3c4b Added plant controller. 2015-02-05 15:53:20 +10:30
Zuhayr
7ed0e26b59 Readded asteroid secret placement, adjusted some values. 2015-01-23 13:40:10 +10:30
Zuhayr
5c37b9e58c Committing some maze fixes and trying to reproduce a weird DD bug. 2015-01-23 13:40:06 +10:30
Zuhayr
cd494cdef1 Added masking turf for asteroid field, fixed issues with distribution map. Replaced asteroid field with mask turf. 2015-01-23 13:40:05 +10:30
Zuhayr
07793edc85 Converted mining map over to this new system. Currently broken. 2015-01-23 13:40:03 +10:30
Mloc-Argent
87a51e27e4 optimize relay_information 
useless del() call, new call deferred

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2015-01-16 23:59:39 +00:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Wild Bill
5bae906c47 Reserve PascalCase inits 2014-12-16 16:20:50 +02:00
Zuhayr
70abe4af0d Merge pull request #7447 from mwerezak/manual-runtime 
Alternative fix for manual runtimes
 2014-12-14 13:06:16 +10:30
mwerezak
168cabf03a Fixes manual runtimes without modifying the construction of every object 
Loads configuration before map creation instead.

This reverts commit 37b14bae39.
 2014-12-13 09:35:36 -05:00
Amunak
7de862cfe1 Fixed non-gamemode votes being unusable 
Hopefully this doesn't break something else.
 2014-12-13 07:21:09 +01:00
Amunak
7411d1c38a Bringing back Secret. 
Hopefully this fixes my previous fix that managed to remove Secret from vote options, because it's not an actual gamemode.
 2014-12-12 21:36:59 +01:00
Amunak
47a3c717e1 Fixes mercenary mode showing up as nuclear in vote 
All gamemodes in the vote just take the actual game mode name instead of the config name.
 2014-12-12 04:20:05 +01:00
Zuhayr
5730bcb885 Merged master/dev config.txt. 2014-12-10 16:35:39 +10:30
ccomp5950
3414e48ceb Adds "paranoid" option to remove more powerful debug options from R_DEBUG. 
The purpose of this is to allow for testers on our test server without them having advance proc call which can do some fun stuff with python, etc.
    Also removes debug controller so that testers can't just edit the configuration to remove debugparanoid

    The default config is the status quo, you have to go out of your way and set this option in config to remove proccal from R_DEBUG
 2014-12-09 21:25:07 -05:00
mwerezak
5b1f7695e3 Remaps the nuke ops shuttle for station docking 
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
 2014-12-05 01:17:17 -05:00