cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,545 Commits 74 Branches 23 Tags
1e457f6e349e793b5ae5bae44a54858aa95b51f2
Commit Graph

4296 Commits

Author SHA1 Message Date
PsiOmegaDelta
1e457f6e34 Merge pull request #9009 from Yoshax/icanintosurgery 
Fixes antag surgery kit
 2015-04-28 07:35:58 +02:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
RavingManiac
89a72fb326 Candle burn time increased to ~30 minutes 
Some fluff added to candle description explaining how they burn in space
 2015-04-27 12:10:54 +10:00
Chinsky
392cc1b0bb Merge pull request #8938 from GinjaNinja32/floorpainter 
Fixes floor painter white-bot and white-delivery states
 2015-04-23 09:20:13 +03:00
GinjaNinja32
bc6daf5b5f Fixes floor painter white-bot and white-delivery states 
Fixes #8937
 2015-04-22 05:21:03 +01:00
PsiOmega
f6d0ab1578 Shower curtains no longer lose their default color upon being washed. 
NT has now invested in slightly less budget curtains.
 2015-04-20 14:42:43 +02:00
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe 
Makes objects without moues opacity not appear via alt-click.
 2015-04-18 16:57:01 +03:00
GinjaNinja32
159dccbfab Fixes floor painter solid-dark icon 
Fixes #8873
 2015-04-17 03:18:53 +01:00
PsiOmega
3eab61e154 Soap can now clean turfs as well. 2015-04-16 08:20:00 +02:00
Chinsky
5fc3a2a511 Merge pull request #8792 from GinjaNinja32/runtime 
Runtime fixes
 2015-04-10 12:24:35 +03:00
Kelenius
20d62c87ff Borg module fixes 
Fixes #8775
Fixes #8797
 2015-04-10 09:50:47 +03:00
GinjaNinja32
958a1c64b3 Fixes PDA detonation runtime 
Fixes #8609
 2015-04-09 16:05:53 +01:00
RavingManiac
e2b9657ca4 Minor fixes to supermatter manual text 2015-04-05 22:40:19 +10:00
mwerezak
c59fac2e16 Adds unloaded item state for the STS-35. 2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
Zuhayr
0bb2cd835c Merge pull request #8600 from mwerezak/bread-tube 
Adds bread tube trash item, merc shuttle vendor
 2015-03-25 00:54:16 +10:30
mwerezak
1ce81b91b1 Adds bread tube trash item 2015-03-24 04:03:06 -04:00
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
PsiOmega
6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm
 2015-03-20 08:26:34 +01:00
PsiOmega
3d9d05afce Fixes #8107. 
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
 2015-03-19 21:33:58 +01:00
Mandurrrh
618249131e Gives more/better comfychair color options. Removes unused icons from objects.dmi. 2015-03-18 00:26:42 -04:00
Zuhayr
e600cdbd3b Fixes #8430 2015-03-17 19:18:30 +10:30
PsiOmega
533ccef0ab Robot code clean up and fixes. 
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
 2015-03-10 13:37:20 +01:00
Zuhayr
00976aea43 Merge pull request #8417 from PsiOmegaDelta/SolidMatter 
Attemps to fix #8390 + solid bonus
 2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27 Merge pull request #8416 from PsiOmegaDelta/Ninjas 
Fixes ninja spawn logic.
 2015-03-10 09:27:11 +10:30
PsiOmega
baed39c263 Attempts to fix persistent station alarms. Makes wardrobes solid. 2015-03-09 20:55:05 +01:00
mwerezak
b9d2517d83 Tweaks random gun spawners and supply packs 
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
 2015-03-09 15:47:25 -04:00
PsiOmega
57c0591283 Fixes ninja spawn logic. 
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
 2015-03-09 19:22:07 +01:00
Raptor1628
cf0e526d91 Fixes and adjustments 
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
 2015-03-04 11:18:40 -05:00
PsiOmega
8f929331d8 Fixes #8343 
Fuel no longer attempts to spread itself after having been deleted.
 2015-03-03 15:33:15 +01:00
Zuhayr
0beb6259f6 Partial fix for #8068. 2015-02-28 17:29:26 +10:30
Zuhayr
14321003f1 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2015-02-28 17:04:22 +10:30
Zuhayr
4b15f1a249 Fixes #7877 2015-02-28 16:47:41 +10:30
Zuhayr
f7983e7732 Merge pull request #8293 from comma/interfacefix 
Couple fixes
 2015-02-28 16:22:36 +10:30
Chinsky
7f01af6b7d Merge pull request #8297 from PsiOmegaDelta/CameraCoverage 
Camera coverage fixes.
 2015-02-27 13:11:21 +03:00
PsiOmega
7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm
 2015-02-27 09:06:48 +01:00
Chinsky
9e07708cb3 Fixes #8241 rollerbeds not collapsing due to a runtime 2015-02-26 14:41:31 +03:00
PsiOmega
98f6a4cae5 Camera coverage fixes. 
Fixes issues with AI cameras coverage not updating properly in several instances during EMPs, destruction, etc.,
 2015-02-26 11:39:41 +01:00
Chinsky
100d8e9fb8 Fixed buckling into chair not changing mob's facing if he had permafacing set. 2015-02-26 12:09:23 +03:00
Zuhayr
a9d23df3ff Merge pull request #8279 from PsiOmegaDelta/CameraNet 
Fixes camera network changes not always being reflected in camera consoles.
 2015-02-26 16:28:49 +10:30
Zuhayr
bceb01c233 Merge pull request #8290 from mwerezak/gun-rewrite 
Fixes captain's laser gun
 2015-02-26 16:28:43 +10:30
mwerezak
ec59f8ab07 Fixes captain's laser gun 
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
 2015-02-25 23:35:20 -05:00
MrSnapwalk
f4f54dfed1 Fixes action figures not randomizing properly. 2015-02-25 21:52:36 -06:00
PsiOmega
4dca85b17c Fixes camera network changes not always being reflected in camera consoles. 
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
 2015-02-25 19:50:07 +01:00
PsiOmegaDelta
51b722485a Merge pull request #8259 from mwerezak/gun-rewrite 
Gun fixes
 2015-02-25 07:21:29 +01:00
mwerezak
9782140d32 Resolves #8236 
Lasers deal more damage to grilles, and clicking directly on the grille
makes it more likely for the grille to absorb the projectile.
 2015-02-25 00:14:42 -05:00
mwerezak
3e71802a52 Replaces colt signal pistol with a Mk58 version. 
Makes more sense for the HoP, and ensures the colt remains more of a
detective signature item.
 2015-02-24 21:23:19 -05:00
Snapshot
600f55bdca Merge pull request #8252 from Raptor1628/dev-freeze 
Assorted Fixes
 2015-02-24 17:08:33 -08:00
Raptor1628
d4870b80ee Assorted Fixes 
Rebalances the random armory so there are always energy weapons,
projectile weapons, and ion weapons. Ammo no longer random. Fixes some
oversights with the EMT area and improves flow. Sec Guns fit in belts.
Fixes typos and a missing price in the vending machine.
 2015-02-24 14:40:02 -05:00