cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,691 Commits 8 Branches 0 Tags
037a901b2283018942f425e7347669597d571c4d
Commit Graph

1842 Commits

Author SHA1 Message Date
PsiOmega
f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
PsiOmegaDelta
fdab654beb Grid check now respects critical APC status. 
Fixes #9919.
On power failure critical APCs are left alone, however on power restoration critical APCs are still included.
 2015-06-25 14:12:05 +02:00
GinjaNinja32
4b5899fa30 Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct 
Corrects two ex_acts.
 2015-06-21 13:16:23 +01:00
PsiOmegaDelta
8100f286a6 Corrects two ex_acts. 
Decreases immovable rod severity to match other ex_acts in file.
Increases meteor gun ex_act severity.
 2015-06-21 13:26:48 +02:00
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
Zuhayr
8664ecaabe Merge pull request #9837 from PsiOmegaDelta/150616-Uplink 
Refactors antag uplink.
 2015-06-21 01:22:56 +09:30
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct 
Base proc: emag_act
 2015-06-21 01:18:25 +09:30
PsiOmegaDelta
99ba26f1ee It is no longer possible to define the amount of telecrystals per game mode. 2015-06-18 10:59:45 +02:00
PsiOmegaDelta
5b4dfdda9c Allows one to define list of random selection items. 
Includes a default list with a couple of semi-randomly selected probabilities.
 2015-06-17 15:04:06 +02:00
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
PsiOmega
ee88e7b8b4 Base Life-addition() 2015-06-13 13:36:08 +02:00
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors 
Ports /tg/'s meteors.
 2015-06-08 14:17:57 +03:00
PsiOmega
fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
 2015-06-07 10:51:41 +02:00
PsiOmega
dc3c2991bf Replaces numbers with constants. 2015-06-07 09:14:23 +02:00
Atlantis
f0026b5c3b RSC paths for ai_help command 2015-06-06 14:55:33 +02:00
PsiOmegaDelta
079b0af6b0 Adds spinning animation for meteors. 2015-06-05 15:55:39 +02:00
PsiOmegaDelta
bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
 2015-06-05 14:59:52 +02:00
PsiOmegaDelta
a07d20d657 Ports /tg/'s meteor implementation. 
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
 2015-06-05 14:58:35 +02:00
Chinsky
026500ea06 Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade 2015-06-05 11:26:25 +03:00
Chinsky
e5a8eb2dfc Actually renames 'going' var. 
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
 2015-06-05 11:07:24 +03:00
GinjaNinja32
63ea8338fb Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/ZAS/Diagnostic.dm
	code/game/machinery/computer3/laptop.dm
	code/game/machinery/requests_console.dm
	code/game/objects/items/stacks/tiles/plasteel.dm
 2015-06-05 00:49:13 +01:00
Chinsky
ad0652d864 Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var). 2015-06-04 22:51:15 +03:00
Zuhayr
ebe62cefd8 Refactored random map generator system and added several terrain generators. 
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
 2015-06-03 04:36:19 +09:30
GinjaNinja32
314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm
 2015-06-02 17:33:20 +01:00
PsiOmega
3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi
 2015-06-01 09:07:03 +02:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks 
End game tweaks
 2015-05-31 23:55:08 +03:00
PsiOmega
d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
 2015-05-30 16:11:57 +02:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection 
Fixes #5945, de-copy-pastes parapens and sleepypens
 2015-05-30 13:57:31 +09:30
PsiOmega
bf27545841 End game turf changes now simply alters color. 2015-05-29 23:38:09 +02:00
GinjaNinja32
d09cd2fe57 Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/jobs/job_controller.dm
	code/game/verbs/ooc.dm
 2015-05-29 21:55:37 +01:00
GinjaNinja32
de4f085057 code/game, excluding code/game/machinery and code/game/objects 2015-05-29 21:51:27 +01:00
Zuhayr
15070d729d Dev-freeze into dev merge. 2015-05-30 00:31:12 +09:30
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens 
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
 2015-05-28 22:23:37 +01:00
Atlantis
7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
Atlantis
ccf9afb9cb Implements PsiOmegaDelta's suggestion (fixed edition) 2015-05-28 17:24:41 +02:00
Zuhayr
5ea78421ff Merge pull request #9408 from mwerezak/sm-eject 
Limits the ability of the SM to return to the station zlevel once ejected
 2015-05-28 11:35:39 +09:30
PsiOmega
bcb1ea5413 Endgame tweaks. 
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
 2015-05-26 12:29:50 +02:00
PsiOmega
5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/toys.dm
 2015-05-26 08:26:48 +02:00
PsiOmega
4956af8597 Fixes #9461. 
Corrects the path of the uplink item.
 2015-05-25 17:59:41 +02:00
Atlantis
c2c3a2c689 Implements remaining suggestions 
- Few more grammar fixes
- Machine overload adjustment finished. SMESs and APCs now receive explosion intensity bonus according to stored charge.
- Gets rid of remains of old "src:" references in AI Life() proc
 2015-05-24 03:05:27 +02:00
Atlantis
da22851ff7 Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge 2015-05-24 01:16:09 +02:00
Atlantis
ef040583c8 Implements github suggestions 
Among others:
- TXT helpfile is now HTML helpfile
- Lots of gremmer changes
- Some adjustments
 2015-05-23 22:22:38 +02:00
Atlantiscze
5aa37bd859 Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge 2015-05-23 21:22:23 +02:00
Atlantiscze
06ec54c7b8 Modified behavior of machine overload to further prevent spam and to make it more useful if targeted on high-power machinery such as SMES. 
- This is a WIP thing. Commiting so i can finish it on my second computer.
 2015-05-23 21:19:32 +02:00
mwerezak
fef7c5ca6c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sm-eject 
Conflicts:
	code/modules/mob/living/living.dm
 2015-05-22 19:38:04 -04:00
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
mwerezak
4ba4bd8dd3 Replaces nuke disk search_contents_for with a global nuke disk registry 2015-05-22 01:15:04 -04:00