cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,353 Commits 74 Branches 23 Tags
52b51a6be47208cd80027e7ea5d4f23bc159b886
Commit Graph

10269 Commits

Author SHA1 Message Date
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
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
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
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
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
mwerezak
2f20f0c537 Fixes #10249 
Moves the isrobot() check so that it only applies to robots interacting
with doors to open them.
 2015-08-02 00:02:33 -04:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
mwerezak
e3609bac94 Adds common proc to obtain the material of an object 
Adds a common get_material() proc to objects, and implements overrides
where applicable
 2015-08-01 23:03:21 -04:00
Zuhayr
2a51b778d6 Fixes #9611 2015-08-01 21:10:48 +09:30
PsiOmegaDelta
75920431e8 Merge pull request #10386 from mwerezak/antag-fix 
Fixes #10309
 2015-07-31 10:26:14 +02:00
PsiOmegaDelta
3c9dc10746 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/cult/runes.dm
 2015-07-31 09:48:15 +02:00
HarpyEagle
7feaf13d81 Fixes #10309 
Antag types with ANTAG_OVERRIDE_JOB are finalized before jobs are handed out, based on the idea that something which replaces a player's job should not need to depend on their assigned job in any way.
Moves the selection of pending antags outside of can_start().
Fixes issue with antag distribution that occurs when a player is a candidate for multiple antagonist types.
 2015-07-30 22:28:17 -04:00
Zuhayr
ad63247749 Merge pull request #10382 from Mloc/freezyfixes 
fixes
 2015-07-31 03:55:34 +09:30
Mloc
2622801d69 Merge pull request #10342 from atlantiscze/radio-fix 
Radio fixes
 2015-07-30 19:25:24 +01:00
Mloc
64e5b6e50a Merge pull request #10343 from GinjaNinja32/communicate-logging 
Adds a log_and_message_admins call to cult communication rune
 2015-07-30 19:25:05 +01:00
Mloc
4413356a63 fix some weirdness with wall damage overlays 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 19:17:23 +01:00
Mloc
3461b7fb5c minor antag distribution fix 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 19:17:17 +01:00
mwerezak
4af4e38571 Fixes #10368 2015-07-29 22:48:11 -04:00
Atlantis
3bb88b327c Fixes #10353 
- Fixes icons not updating properly
- Also fixes a runtime.
 2015-07-29 23:16:27 +02:00
Atlantis
07daa25de9 Updates telecommunications presets 
- Changes some hardcoded frequency numbers i used to use proper constants.
- Fixes non-common channels not working due to signal not getting to the server.
 2015-07-29 11:17:42 +02:00
mwerezak
6df770cab3 Fixes projectiles being able to hit humans in organs they do not have. 
Will also prevent body shields blocking bullets with non-existant limbs. Expands on the special return values for bullet_act(), adds defines for them.
 2015-07-28 20:23:26 -04:00
mwerezak
d203362d38 Fixes #10258 
Turrets now aim at the chest/groin unless the target has a neck grab on someone, otherwise they aim elsewhere.
Projectiles are now able to miss targets that are lying or buckled, except when the target is at point blank range and is the original target for the projectile.
 2015-07-28 20:17:32 -04:00
GinjaNinja32
57e8d07085 Adds a log_and_message_admins call to cult communication rune 2015-07-28 13:29:50 +01:00
Atlantis
2fb1d74444 Telecommunications adjustment 
- This commit attempts to resolve #7294
- Common and AI Private channels are now separate from other non-department frequencies. I hope this will reduce load on Common server, therefore mitigating the overload? problems that may cause duplication of messages.
- Another server has been added, which handles all non-department non-common frequencies. This server is likely to be under minimal load so i hope the duplication bug shouldn't happen again.
- Unmaps one broadcaster and receiver from telecomms in another attempt to remove duplication
 2015-07-28 12:34:57 +02:00
Atlantis
e10a1f3e01 Mercenaries/Raiders should now have proper headset again 
- This should fix #10313
 2015-07-28 10:48:22 +02:00
PsiOmegaDelta
0838de3ba2 Compilation fixes. 2015-07-27 10:03:31 +02:00
PsiOmegaDelta
c159f4657a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/inventory.dm
 2015-07-27 09:53:08 +02:00
Zuhayr
64ccd8a048 Merge pull request #10269 from Mloc/lightwrite 
lighting work
 2015-07-27 11:41:14 +09:30
Zuhayr
433b55f3df Merge pull request #10303 from PsiOmegaDelta/150726-MintingRemoval 
Removes minting.
 2015-07-27 11:40:41 +09:30
Mloc
fe4490a295 fixes #10316 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-26 20:53:13 +01:00
SparklySheep
a5ca80656d Chops out "Security Cadet" from assistant Alt Titles. 
Will remove the other "intern" alt titles if requested but this one in particular seemed to be pretty disliked in this thread: http://baystation12.net/forums/threads/discussion-suggestion-alt-titles.237/
 2015-07-26 16:58:52 +01:00
PsiOmega
07cf41604c Removes minting. 
Fixes #10274.
 2015-07-26 11:28:16 +02:00
PsiOmega
659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm
 2015-07-26 10:00:12 +02:00
PsiOmega
13ca02677c Fixes #10203. 
setup_economy() was previously called twice, the removed call happened before character creation.
Moves the remaining line to ensure proper setup order.
 2015-07-25 14:08:19 +02:00
Chinsky
cc75e8d220 Merge pull request #10271 from mwerezak/recharging-station 
Fixes #10003
 2015-07-25 05:33:21 +03:00
Zuhayr
1851ec58cd Merge pull request #10277 from GinjaNinja32/changelingtypo 
Fixes typo in changeling absorbing
 2015-07-25 00:23:37 +09:30
PsiOmegaDelta
9b0497e01e Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-24 10:46:32 +02:00
GinjaNinja32
006ed3ec53 Fixes typo in changeling absorbing 2015-07-24 02:35:49 +01:00
PsiOmegaDelta
83289c1b78 Merge pull request #10273 from Kelenius/ofRobotsAndBoxes 
Of robots and boxes
 2015-07-23 09:15:46 +02:00
Kelenius
7efaab0ab4 Fixes #9540 - borg message when using DA on storage 
Radically. Frankly, this message is useless.
 2015-07-23 10:10:10 +03:00
mwerezak
8b81dadfc5 More cleanup 
Removes dynamic member lookup in rechargestation.dm. Removes unused proc allow_drop().
 2015-07-23 01:56:39 -04:00
mwerezak
f0bfd03898 Updates recharge station desc when parts are refreshed 2015-07-23 00:07:28 -04:00