cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,943 Commits 2 Branches 1 Tag
ecd7df9628a7cd15662965b9482cfccebb5d94e4
Commit Graph

7497 Commits

Author SHA1 Message Date
mwerezak
56ccd4303b Merges taser and stun baton effects 
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
 2014-07-31 16:21:22 -04:00
mwerezak
c8cccb64f6 Adds siemens_coefficient handling to stun batons 2014-07-31 15:38:56 -04:00
mwerezak
9bfb4642a2 Merge remote-tracking branch 'upstream/dev' into stun-baton 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	Made all obj/item/weapons have "swing_hit" as their default hitsound.
	Made hitsound not play when the attack misses.
 2014-07-31 14:31:21 -04:00
mwerezak
7130fd124b Stun baton nerf 
Adds agonyforce var to stun batons, which causes halloss and eye blur.

Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
 2014-07-31 13:39:06 -04:00
Zuhayr
202398d0e2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-31 23:08:14 +09:30
Rob Nelson
68a13a6d60 Vending machine href exploit fix 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/vending.dm
 2014-07-30 21:47:29 +01:00
PsiOmega
3ad8f4ca24 Merge branch 'dev' into Pics 
Conflicts:
	code/modules/paperwork/photography.dm
 2014-07-29 16:45:55 +02:00
Chinsky
fcdca5ca5b Merge pull request #5832 from Baystation12/master 
master - > dev
 2014-07-29 18:37:19 +04:00
Chinsky
8ccac61068 Merge pull request #5820 from Zuhayr/hydroponics 
Bevy of newhydro fixes.
 2014-07-29 17:59:28 +04:00
Chinsky
bf686a6401 Merge pull request #5815 from PsiOmegaDelta/Mecha 
An Odysseus with patients now bypass mech movement-overrides.
 2014-07-29 17:58:18 +04:00
PsiOmega
2f8bb7e135 Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them. 2014-07-29 15:45:22 +02:00
mwerezak
e104647404 Sound fixes 2014-07-28 14:09:16 -04:00
Zuhayr
f8e50b28f5 Bevy of newhydro fixes. 2014-07-29 00:20:38 +09:30
Mloc
f7cfe55867 Merge pull request #5816 from Loganbacca/trainfix 
More train fixes
 2014-07-28 12:45:00 +01:00
Mloc
7b4382977b Merge pull request #5813 from PsiOmegaDelta/Shuttle 
Fixes #5810
 2014-07-28 12:42:58 +01:00
Zuhayr
ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
Loganbacca
5457cee527 More train fixes 
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
 2014-07-28 20:39:42 +12:00
PsiOmega
b935d7a0e0 An Odysseus with patients now bypass mech movement-overrides. 2014-07-28 10:25:29 +02:00
PsiOmega
537fa50728 Area naming consistency 
Changes area name from "supply shuttle" to "Supply Shuttle" to match the casing of other areas.
 2014-07-28 08:37:14 +02:00
Zuhayr
f61139f501 Merge pull request #5811 from DJSnapshot/hotfix 
Massive bugfix/improvement to 3D sounds
 2014-07-28 15:45:11 +09:30
DJSnapshot
f6b75d833c now you can hear next to you in space! 2014-07-27 23:10:57 -07:00
DJSnapshot
3b5d40c470 Big nerf and cleanup of 3D sound. should fix most of #5789 2014-07-27 21:27:41 -07:00
Zuhayr
11a2b0eb3c Merge pull request #5792 from Whitellama/flavourtext 
Dynamic Flavour Text
 2014-07-28 10:11:02 +09:30
PsiOmega
fc5d33917b Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives. 2014-07-27 23:32:36 +02:00
PsiOmega
2c076b4e46 Merge branch 'dev' into MechInstall 2014-07-27 12:52:42 +02:00
Chinsky
4e96420e49 Merge pull request #5761 from Zuhayr/hydroponics 
BYOND akbar
 2014-07-27 14:38:18 +04:00
PsiOmega
4f8dc3f951 Installs the new mecha-sensor in the departure area airlocks and the shuttle itself. 
Also corrects the online icon state for the sensor and allows the simple docking controller to toggle the on/off state.
 2014-07-27 10:58:55 +02:00
Zuhayr
c6e97ecc9a Merge pull request #5791 from PsiOmegaDelta/Roadblock 
Mech/Train sensor
 2014-07-27 10:12:55 +09:30
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
PsiOmega
0036bea6b6 A sensor which registers mechs and trains attempting to pass by and, if necessary, blocks their movement. 
If enabled, detects mechs/trains and blocks their movement if they are coming from any of the directions set by dir. Can currently only be enabled/disabled by radio command and airlocks are updated to utilize this.

The current setup allows mechs to move through airlocks during normal cycles, which for example lets Odysseus out to save lives.
Once a shuttle docks however, the sensors are enabled to prevent boarding.

If blocked, players receive a simple message stating that their command has been overridden.
 2014-07-26 20:07:18 +02:00
Zuhayr
dc10f92ad1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:23:35 +09:30
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Mloc-Hibernia
a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm
 2014-07-26 14:25:24 +00:00
Chinsky
11a1370b10 Merge pull request #5781 from PsiOmegaDelta/Tweaking 
Engine room and Atmospherics  changeup.
 2014-07-26 17:56:00 +04:00
Walter0o
df6ac58d84 fixes nullpointer caused by broken organ list pt 2 
more a prevention than a fix, but meh
 2014-07-26 13:08:25 +02:00
PsiOmega
1bee077475 Engine room and Atmospherics changeup. 
The supply pipe in Atmospherics no longer cross the middle of the room, after having seen many a complaint about this. Now passes through the aft windows instead.

Atmosphere technicians can now assist in handling the engine waste without entering the engine room itself.

Engine waste canisters are now pre-labeled according to future contents. Can be re-labeled should someone desire to try the oxygen setup instead.

The engine core now uses a similar setup as the atmospheric tanks, allowing control of the injection/extraction of gases from the monitor room.

Pipes  in the engine room overlapp less, making them easier to follow.

There is now a basic meteor protection layer around the engine room like solar panels have. Should stop a lone meteor or two, for anything more Renwick shields will still be desirable.
There is also a fairly wide gap by the ejection port, to ensure the supermatter doesn't snag into it, where meteor can sneak through.
 2014-07-26 11:44:22 +02:00
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/client/preferences.dm
 2014-07-25 17:19:59 -07:00
DJSnapshot
a4fc2b04a2 fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 2014-07-25 16:56:56 -07:00
Chinsky
f33e11383b Merge pull request #5751 from DJSnapshot/hotfix 
Bug Fixes!
 2014-07-26 03:28:54 +04:00
DJSnapshot
ec238be981 Revert and fix for e-nets. 2014-07-25 16:23:26 -07:00
Zuhayr
6e63659855 Merge pull request #5743 from meyar/dev 
CSI BAYSTATION: The detectivining.
 2014-07-26 01:29:37 +09:30
Zuhayr
d8336061b4 Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev 2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
Zuhayr
99909e3aba Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-25 22:47:57 +09:30
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
6f44f6c1e7 Removed outdated file. 2014-07-25 22:16:29 +09:30