cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-19 19:10:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,415 Commits 98 Branches 23 Tags
631ff219800cc772b645d78d2bb6ff2bdc24e62d
Commit Graph
10320 Commits
Author SHA1 Message Date
GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
 2015-08-11 18:47:05 +01:00
Chinsky 7b1656f40c Merge pull request #10470 from Karolis2011/dev-freeze 
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
 2015-08-11 20:07:06 +03:00
mwerezak 8064a76f39 Merge pull request #10484 from atlantiscze/laptop-quickfix 
Fixes #10136
 2015-08-11 13:06:32 -04:00
Chinsky 4c628ff2c5 Merge pull request #10483 from PsiOmegaDelta/150811-AntagName 
Fixes #10468 and #10467
 2015-08-11 19:39:15 +03:00
Zuhayr 7bd301161f Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes 
Magical fixes.
 2015-08-12 01:54:31 +09:30
Atlantis d63d2817a1 Fixes #10136 
- Quick fix for #10136, laptops now use the #define-d values rather than hardcoded strings. Camera net keys work again properly.
- I also adjusted laptop's power usage. With how it used to be, you could buy laptop and let it run for whole shift, never having to recharge even with weakest cell. Right now, it lasts about 10 minutes on worst cell, and almost one hour on the best one. Actual power usage (in watts) is slightly lower than stationbound consoles.
 2015-08-11 12:42:26 +02:00
SomeoneElseandKarolis2011 8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta 54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
PsiOmegaDelta f85e9146ab Fixes #10468. Fixes #10467. 
Updates the DNA name as well, upon antag name change.
 2015-08-11 12:11:32 +02:00
Kelenius 1324e69a19 Fixes #10466 - chem implant can't be loaded 
What the literal shit.
 2015-08-11 10:26:22 +03:00
PsiOmegaDelta 4bb6749f24 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-11 08:34:46 +02:00
PsiOmegaDelta e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm
 2015-08-11 08:21:06 +02:00
PsiOmegaDelta ef9ebdc741 Merge pull request #10476 from atlantiscze/emp-fix 
Fixes #10446
 2015-08-10 23:09:35 +02:00
Atlantis dd79e0f481 Fixes lengthy emp_act() for turret controllers and doors. 
- Turret controllers were the same as turrets. Now completely fixes #10446
- Doors also had 10ds sleep() in them, hidden under small probability roll. Fixed.
 2015-08-10 23:04:37 +02:00
Atlantis 40cb786986 Adds EMP monitoring for future EMP debugging 
- Adds possibility to enable EMP debugging, that monitors how long emp_act() took on object. If it took too long (configurable) it generates a message. It is disabled by default due to possible performance loss with large EMPs.
 2015-08-10 22:58:33 +02:00
Atlantis 7297535750 Fixes mistake in turret code 
- Turrets no longer freeze any EMP that hits them for 6-60 seconds.
 2015-08-10 22:39:22 +02:00
Atlantis d3dbf3c199 Adjusts names of two areas 
- Messaging Server Room -> Research Server Room - That's the server room near toxins storage/misc. research. It has absolutely nothing to do with messaging, as it houses Research's servers only.
- AI Server Room -> Messaging Server Room - That's the actual server room that houses messaging server in central section of the station.
 2015-08-10 21:39:35 +02:00
PsiOmega 570806046b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/custom_sprites.dm
	code/modules/organs/organ_stump.dm
	code/setup.dm
 2015-08-10 17:56:14 +02:00
PsiOmega fb6ab23189 Makes the new initialization message use the proper method. 2015-08-10 17:46:38 +02:00
PsiOmega a710e77d46 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/controllers/master_controller.dm
	code/game/area/areas.dm
 2015-08-10 17:42:40 +02:00
SomeoneElseandKarolis2011 64c59d3145 replace \red usages with various <span> usages in runes.dm 
code/game/gamemodes/cult/rules.dm:
	replaced {\red,\b} with <span class='{danger,warning,cult}'>.
	added some span class guidelines esp. on cult for future consistency.
 2015-08-10 12:58:37 +03:00
mwerezak 12549b7e93 Fixes area power initialization 
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
 2015-08-09 19:58:37 -04:00
mwerezak 15cbd0e0a2 Merge pull request #10461 from PsiOmegaDelta/150809-ExplosionGarbage 
Explosion particle GC.
 2015-08-09 09:36:54 -04:00
PsiOmega d1a4f4b0a4 Compilation fixes and partial revert of #10456. 2015-08-09 13:27:59 +02:00
PsiOmega 889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-08-09 13:15:22 +02:00
PsiOmega 6a15611711 Explosion particle GC. 
Explosion particles cheated, only nulling the location and hoping to get collected one day.
 2015-08-09 12:35:07 +02:00
PsiOmegaDelta 31b8335298 Merge pull request #10456 from mwerezak/air-alarm 
Fixes
 2015-08-09 10:09:02 +02:00
mwerezak 83abfcf7af Fixes #9594 
Areas now initialize to having all power channels off.
 2015-08-09 00:02:50 -04:00
mwerezak 1486876e73 Fixes #10449 
Reimpements trace gas checking for air alarms. Removes duplicate danger level checking in air alarm nanoui code, as all of that is already calculated as part of air alarm processing.
 2015-08-08 23:59:38 -04:00
mwerezak d9ee308dbe Merge pull request #10450 from GinjaNinja32/syndicate-beacon 
Fix inverted arguments in syndicate beacon self-destruct
 2015-08-08 10:59:15 -04:00
PsiOmega e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
 2015-08-08 15:34:51 +02:00
PsiOmegaDelta c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix 
Material stack related fixes
 2015-08-08 09:56:25 +02:00
GinjaNinja32 c1675bb32b Fix inverted arguments in syndicate beacon self-destruct 
Far less likely to gib people now.
 2015-08-07 23:11:50 +01:00
HarpyEagle fc7e89380e More material renames 
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
 2015-08-07 17:10:35 -04:00
PsiOmegaDelta a6d9002806 Merge pull request #10442 from Baystation12/dev-freeze 
Dev freeze
 2015-08-07 10:37:47 +02:00
PsiOmegaDelta 8ca5d01dcf Crematorium Destroy() 
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
 2015-08-06 08:39:24 +02:00
PsiOmegaDelta 03578d4ea3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-06 08:12:38 +02:00
mwerezak e5950d32d8 Merge pull request #10264 from RavingManiac/dev-freeze 
Refactors floating and magboot checks. Fixes #10256
 2015-08-05 23:05:34 -04:00
PsiOmegaDelta 3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta 6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
 2015-08-05 09:16:50 +02:00
GinjaNinja32 595b58197d fix pAI radios not working 2015-08-05 00:49:28 +01:00
mwerezak 9ee2482fda Merge pull request #10422 from PsiOmegaDelta/150804-SomeOfYouPeopleAreSoPicky 
Uses raised TM symbol in the mirror name.
 2015-08-04 16:27:34 -04:00
PsiOmegaDelta 93011f94c4 Merge pull request #10425 from Baystation12/dev-freeze 
Dev
 2015-08-04 13:07:11 +02:00
PsiOmegaDelta 4d57f5ef66 Uses raised TM symbol in the mirror name. 
Now uses the HTML code for the trademark symbol.
 2015-08-04 10:41:28 +02:00
mwerezak d1bd146b1a Changes reinforced glass material name 
Gives the reinforced glass material a name that is easier to verify for
correctness.
 2015-08-03 23:01:34 -04:00
mwerezak d25d0c700c Fixes #10403 
can_start() no longer attempts to rebuild the antag candidate lists but
instead reads the existing lists that are now built in pre_setup()

Also fixes an inverted check that was preventing antags from spawning.
 2015-08-03 20:01:55 -04:00
mwerezak 76ceaa904b Fixes admin or event spawned antags not spawning 
Pending players were selected but the antag roles were never finalized.
 2015-08-03 12:06:23 -04:00
mwerezak 2e1607f611 Fixes #10414 
Antagonists are again drafted in attempt_spawn() and all players in the pending list will be spawned (provided they pass sanity checks).
Instead, attempt_spawn() is called in either pre_setup() or post_setup() depending on if the ANTAG_OVERRIDE_JOB flag is set. And all antags have
their spawning finalized in post_setup().

In addition, if game mode setup fails, all pending antagonist players have their special roles cleared.
 2015-08-03 12:03:08 -04:00
RavingManiac aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
PsiOmegaDelta 998b72bcd8 Fixes #10372. 
Removes snowflake attack code.
 2015-08-03 09:20:36 +02:00