cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 5 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

843 Commits

Author SHA1 Message Date
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16 Merge pull request #810 from Zuhayr/bayupdate 
Bay update.
 2016-02-05 23:21:07 -05:00
Zuhayr
115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
Datraen
4c0bd923c3 Merge pull request #866 from Kelenius/viroRemoval 
Removes the old virus system
 2016-02-05 21:06:09 -05:00
Zuhayr
408cb5d8d8 Adds a coverage check to xenoflora splattering, adjusts brainloss across 
the board.
 2016-01-31 11:49:14 +10:30
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +10:30
Kelenius
b86c730695 Removes the old virus system 
Appendicitis moved to appendix organ
 2016-01-27 11:44:41 +03:00
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Kearel
5727971690 Semi ports Baystation12/Baystation12#11445 2016-01-25 20:35:52 +00:00
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Kelenius
671b3b2d96 Removes copypaste 2016-01-18 16:04:01 +03:00
Kelenius
ee531578d7 Fixes #94 
Protolathe and CI will now correctly eject materials.
 2016-01-18 15:06:33 +03:00
Neerti
3cf4ffcd2b Fixes ghost-callers being unable to hear linked communicators. 
Fixes exonet node research pattern being wrong.
Makes communicators showing up on the ghost communicator list have stricter checks for being able to receive a request.
 2015-12-16 16:01:52 -05:00
Neerti
3e5436c4b7 Upgrades communicators to NanoUI, adds a new EPv2 fake networking system, adds new semi-telecomms machine, lets communicators call ghosts, call other communicators, and have as many ghosts or communicators linked as the user desires. Adds preference option to remain invisible on communicator device searches. 2015-12-14 15:43:53 -05:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
Atlantis
c7e7c05a34 Fixes #11546 2015-12-02 11:14:41 +01:00
PsiOmegaDelta
26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
GinjaNinja32
8e1928062b sulphuric acid is "sacid" not "acid" 2015-11-20 21:41:31 +00:00
Kelenius
531809efa2 Fixes #11347 
Jesus Christ how horrifying
 2015-11-10 14:15:37 +03:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
 2015-11-06 17:41:18 -05:00
PsiOmegaDelta
42b98c45e4 Merge pull request #11220 from caelaislinn/new_xenoarch_sprites 
Replaces xenoarch gun sprites with CC licenced alternatives from OpenGameArt.org
 2015-11-03 11:14:03 +01:00
Cael Aislinn
105792686a resprites xenoarch items (guns, eguns and other small stuff) and some large artifacts by skowron, reworks preset triggers to be a little more predictable for specific large artifact groups 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-10-17 02:02:55 +10:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04:00
HarpyEagle
38775120d7 Updates mechfab 
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
 2015-10-08 16:03:32 -04:00
mwerezak
83df0fa8f8 Makes powercells produced by the protolathe start uncharged. 2015-10-08 15:10:51 -04:00
Kelenius
83adba88d4 Updates blob 
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
 2015-10-05 18:10:16 +03:00
PsiOmegaDelta
96a90bb5e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-10-04 17:41:02 +02:00
PsiOmegaDelta
f4be4c0ad9 Merge pull request #11238 from Baystation12/master 
Dev-freeze
 2015-10-04 17:31:44 +02:00
GinjaNinja32
11141462a0 fix #11222 
also fixes the name and adds feedback to adding items
 2015-09-30 00:00:36 +01:00
PsiOmegaDelta
11a03abbf7 Makes more external sources of radiation respect rad-protection. 
More radiation sources now use the apply_effects() proc to increase rad levels, as this proc respects radiation protective gear (such as radiation suits).
Does not affect internal sources, such as food, injections, etc.
 2015-09-25 15:02:20 +02:00
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade 
Adds fragmentation grenades
 2015-09-07 14:12:27 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Neerti
a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge 
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
 2015-09-06 18:26:06 -04:00
Kelenius
1ac8b94427 Fixes a few issues with the mechfab, fixes #10852 2015-08-25 12:28:20 +03:00
Kelenius
dd11a301e4 Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm
 2015-08-24 18:16:36 +03:00
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
 2015-08-23 01:30:46 -04:00
PsiOmega
e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
 2015-08-21 20:27:48 +02:00
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Kelenius
6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm
 2015-08-21 16:59:57 +03:00
PsiOmegaDelta
a0a09c04e4 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 2015-08-20 14:09:07 +02:00
Zuhayr
a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07:00
PsiOmegaDelta
5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/Sleeper.dm
 2015-08-17 13:05:58 +02:00
Kelenius
3b1c5666d5 Merge branch 'dev' into ofMechfabAndPanic 2015-08-17 09:58:23 +03:00
Zuhayr
23e9c7d4c9 Merge 2015-08-16 17:10:11 -07:00
SomeoneElse
9b547608f6 [minor] Fix research design item path definition, usage of TECH_* macros 
code/modules/research/designs.dm:
	fixed path definition of `datum/design/circuit/shield`
	fixed req_tech variable to now use TECH_* macros
 2015-08-17 00:25:37 +06:00
Kelenius
7c1d9b5614 Mech chargers are now a single machine 
Can be built and upgraded
Resolves #5215
 2015-08-16 06:07:36 -07:00
GinjaNinja32
7dc85cfdd4 Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates 
Computers are now overlay based.
 2015-08-16 00:40:47 +01:00
mwerezak
77ddae4e26 Structures now take damage properly from projectile clouds 2015-08-15 19:08:45 -04:00