cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,041 Commits 2 Branches 1 Tag
f14922f1f82c94de98a2dc14fd749b2112708df5
Commit Graph

5014 Commits

Author SHA1 Message Date
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
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
PsiOmega
768faa4bf0 Fixes #8266. 
Ensures drones get access to the alarm monitor subsystem.
Restores the Show Alerts link in alarm notices.
 2015-02-25 09:07:04 +01:00
mwerezak
401709cd23 Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite 2015-02-24 20:15:18 -05:00
mwerezak
5124055663 Fixes #8243 
Didn't want to have to generate even more lists so this is what you get.
 2015-02-24 19:42:24 -05:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
Chinsky
b73d541c65 Merge pull request #8155 from PsiOmegaDelta/subsystems 
Centralized Alarm Handling
 2015-02-24 04:39:48 +03:00
PsiOmega
d8245540ef Restores silicon alarm notices. 2015-02-23 21:29:00 +01:00
PsiOmega
1c763ff2c9 Merge remote-tracking branch 'upstream/dev' into subsystems 2015-02-23 10:32:32 +01:00
PsiOmega
5578afa07c General update. 
NanoUI interface sorted.
Accessible by AI, borgs, and through consoles.
Automatic alarm resets in case of lost sources.
 2015-02-23 10:32:25 +01:00
PsiOmegaDelta
bbbde676d5 Merge pull request #8200 from mwerezak/devfixes 
Misc dev updates
 2015-02-23 10:15:42 +01:00
mwerezak
3ae3ef7961 Merge remote-tracking branch 'upstream/dev' into runtime 2015-02-22 21:13:20 -05:00
Chinsky
2d03c412f7 Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor 
Examine Tab 2: Revenge of the Refactor: Reloaded
 2015-02-22 11:32:32 +03:00
Zuhayr
28e7411e2d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-22 16:28:06 +10:30
mwerezak
11719a380e Fixes #8151 2015-02-21 15:49:52 -05:00
Zuhayr
e0267c4adf Merge pull request #8194 from comma/gore 
Surgery overlays
 2015-02-22 01:00:47 +10:30
Chinsky
acfd99e33c Surgery now shows up on mob, in all gory glory. 2015-02-21 16:31:44 +03:00
Zuhayr
14f8e3beac Numerous kitchen changes in tandem with prior commit. Removed processor. 2015-02-21 22:24:01 +10:30
Zuhayr
0c206344b6 Master<dev 2015-02-21 19:57:31 +10:30
Zuhayr
2ecd76b07f Master merge. 2015-02-21 19:51:28 +10:30
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths 
Adds robot synths
 2015-02-21 11:43:39 +03:00
Chinsky
2b2332cfc1 Merge pull request #8157 from mwerezak/gun-rewrite 
Better handling of mob projectile passthrough and embedding + some gun tweaks
 2015-02-21 07:52:58 +03:00
Chinsky
6bd495fc47 Merge pull request #8164 from PsiOmegaDelta/NanoAir 
Air Alarm and Atmospheric Controller NanoUI
 2015-02-21 07:51:01 +03:00
PsiOmega
5b299e0104 NanoUI atmosphere control and remote air alarm support. 2015-02-20 17:39:55 +01:00
Zuhayr
31edc34a3d Merge pull request #8184 from Kelenius/ofDronesAndVerbs 
Axes drone verb category
 2015-02-21 02:32:30 +10:30
Kelenius
4aee297d2e Axes drone verb category 
Moves verbs to "robot commands"
 2015-02-20 17:21:12 +03:00
Neerti
3f16754e89 Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay. 
The entire system is now self-contained inside a module folder.
Also fixes a runtime I made because ghosts lack a mind (and so do I)
 2015-02-20 08:04:17 -05:00
Kelenius
a0b73140e9 Fixes for synths and decompiler 2015-02-20 13:32:10 +03:00
Kelenius
1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +03:00
Chinsky
fde327a83c Merge pull request #8121 from Neerti/2_13_2015_examine_tab 
Adds the Examine Tab.
 2015-02-19 21:00:22 +03:00
PsiOmega
ead0f31426 Revises how Topic and NanoUI shares allowance-logic. 
All mob-interaction logic now resides in nanointeraction.dm and is called by the base CanUseTopic().
Specifics for when objects allows mob-interaction can be specified by overriding CanUseTopic(), see machinery.dm.
 2015-02-19 18:22:19 +01:00
Chinsky
ae0ce4e620 Merge pull request #8170 from mwerezak/inventoryfix 
Fixes #8075 + cigar/pipe overlays
 2015-02-19 19:59:16 +03:00
Chinsky
3c4bc1984c Merge pull request #8159 from mwerezak/grab 
Updates grabbing
 2015-02-19 19:59:13 +03:00
mwerezak
1258517202 Fixes hiding mobs being layered underneath vents 2015-02-19 01:02:32 -05:00
mwerezak
82480ac1a7 Minor cleanup 2015-02-19 00:43:49 -05:00
mwerezak
6b6fcf81f2 Fixes #8075 2015-02-18 23:55:21 -05:00
mwerezak
11e5497368 Merge remote-tracking branch 'upstream/dev' into gun-rewrite 
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
 2015-02-18 18:28:18 -05:00
mwerezak
583390937e Improves bullet projectile embedding handling 
Commit b1546ee3eb contained a rather
bone-headed mistake, that resulted in embedding with penetrating
projectiles to not behave as desired.

This commit fixes that, and provides a cleaner implementation.
 2015-02-18 18:09:24 -05:00
Raptor1628
2ae273e1b8 Gear again 
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
 2015-02-18 15:35:37 -05:00
PsiOmegaDelta
4e785f716a Merge pull request #8160 from mwerezak/stools 
Replaces stool structures with stool items
 2015-02-18 07:35:54 +01:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
mwerezak
5f700f2f6e Updates human examine description 
Updates the human examine description so that the message about not
breathing is shown in more cases when src is not breathing.
 2015-02-18 00:18:28 -05:00
mwerezak
6479c909cd Updates grabs 
Replaces broken client/Process_Grab(), makes resisting neck grabs
actually work. Fixes the grabbed_by list filling up with null entries
when a grab is broken. Aggressive grabs now prevent movement, can still
be quickly broken using resist or disarm. Neck grabs are easier to
resist if the grabber has moved recently. Some minor cleanup.
 2015-02-17 23:40:51 -05:00
Zuhayr
ae1161184c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-18 14:17:39 +10:30
PsiOmegaDelta
fdc15d98fe Merge pull request #8149 from mwerezak/gun-rewrite 
[DNM] Projectile and gun fixes
 2015-02-17 16:19:41 +01:00
Chinsky
eb4a75c9b3 Merge pull request #7986 from Hubblenaut/sprites 
Adds on-sprite belt icons
 2015-02-17 15:22:16 +03:00
Chinsky
e596d45013 Merge pull request #8137 from mwerezak/lexorin 
Lexorin cleanup
 2015-02-17 11:58:34 +03:00
PsiOmega
ec4b8c78a1 Merge remote-tracking branch 'upstream/dev' into subsystems 
Conflicts:
	code/game/machinery/camera/camera.dm
	code/modules/mob/mob.dm
 2015-02-17 08:36:12 +01:00
PsiOmega
2e9c266a2f Basic main structure for centralized alarm handling. 2015-02-17 08:34:26 +01:00