cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,838 Commits 2 Branches 1 Tag
ff665a2cb3a5e647fe1ed9d65b26f2a537e96223
Commit Graph

15582 Commits

Author SHA1 Message Date
Chinsky
ff665a2cb3 Merge pull request #7039 from Amunak/beaker-fix 
Beaker fix
 2014-11-18 01:58:56 +03:00
PsiOmega
e78a9c3efe Merge remote-tracking branch 'upstream/dev' into Service 2014-11-17 12:00:01 +01:00
Chinsky
ce3618a200 Merge pull request #6987 from MagmaRam/labcoat 
Reworked labcoat buttoning
 2014-11-17 04:17:16 +03:00
Chinsky
b3e2b20f91 Merge pull request #7023 from GinjaNinja32/borg_latejoin 
Fix cyborg latejoining, allow mid-round joining, add robot cryo equivalent
 2014-11-17 04:15:18 +03:00
Amunak
07b050435f fixes redundant information for a custom beaker description 2014-11-16 20:34:12 +01:00
Amunak
4a845beb7d corrects volume shown in description of beakers 2014-11-16 20:33:25 +01:00
PsiOmega
743d9be7d3 Merge remote-tracking branch 'upstream/dev' into Service 2014-11-16 10:34:42 +01:00
MagmaRam
4c5ae21aab Fixed typo that broke everything 
Haste makes waste and breaks everything. At least this time it was less
broken than last time.
 2014-11-16 03:31:22 -05:00
MagmaRam
d01e14eb58 Revert "Revert "Changed defining of icon_open and icon_closed as requested"" 
This reverts commit 046c92419e.
 2014-11-16 03:24:39 -05:00
MagmaRam
046c92419e Revert "Changed defining of icon_open and icon_closed as requested" 
This reverts commit 8d34ffe397.
 2014-11-16 03:24:33 -05:00
MagmaRam
cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat 
Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
 2014-11-16 02:56:32 -05:00
Zuhayr
b9a52a6c35 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-16 18:17:31 +10:30
Chinsky
d0d2a100bd Merge pull request #7018 from GinjaNinja32/robot_move 
Fixes cyborg movement depending on actuators when not caused by cyborg
 2014-11-16 10:17:31 +03:00
Chinsky
599cb247bc Merge pull request #7020 from MrSnapwalk/epsilon 
Adds several custom items/cyborg sprites.
 2014-11-16 10:17:25 +03:00
Chinsky
79d269c515 Merge pull request #7028 from PsiOmegaDelta/Portable 
Portable Turret Fixes
 2014-11-16 10:15:01 +03:00
Chinsky
8a13bfe0dd Merge pull request #7030 from PsiOmegaDelta/AirAlarm 
Silent Alarms
 2014-11-16 10:14:36 +03:00
GinjaNinja32
51020f9e84 Merge branch 'dev' into borg_latejoin 2014-11-15 21:13:04 +00:00
MagmaRam
8d34ffe397 Changed defining of icon_open and icon_closed as requested 2014-11-15 14:36:10 -05:00
Chinsky
dd7e2d4874 Merge pull request #7019 from PsiOmegaDelta/MapFix 
Map Fixes
 2014-11-15 22:32:36 +03:00
GinjaNinja32
bc326280c1 Merge branch 'dev' into borg_latejoin 2014-11-15 18:54:20 +00:00
PsiOmega
c7e634a8a6 Merge remote-tracking branch 'upstream/dev' into Service 2014-11-15 19:32:35 +01:00
Chinsky
ba77ebc2c4 Merge pull request #7032 from PsiOmegaDelta/Scrubbers 
Scrubber Icons
 2014-11-15 21:28:02 +03:00
Menshin
cd1487f1fa Rewrote maploader to act faster and better handle set variables. 
Most notably :
* better loading times, less processing loops
* lists variables are now taken into account (simples and associatives)
* every character can now be used inside a string without fear of breaking the loading process
 2014-11-15 01:33:13 +01:00
GinjaNinja32
95f0204332 Adds robot equivalent of cryo 2014-11-14 23:39:30 +00:00
GinjaNinja32
d10311befd Adds cyborg-only latejoin spawnpoint 2014-11-14 23:38:09 +00:00
GinjaNinja32
a725526e4a Fix cyborg latejoining, allow mid-round joining 2014-11-14 23:38:08 +00:00
PsiOmega
7ff2e4547b Scrubber Icons 
Gives online scrubbers a slightly more appropriate icon while viewed in the map.
 2014-11-14 18:48:56 +01:00
PsiOmega
9096b74f54 Silent Alarms 
Attempt to fix the issue where air alarms with disabled alarm reporting still notified the monitoring consoles.
 2014-11-14 15:11:27 +01:00
PsiOmega
1e29289986 Dedicated Service Server 
The service radio channel now has its own dedicated message log server on the telecommunication satellite.
As a bonus the telecommunication equipment room is now symmetrical.
 2014-11-14 14:18:23 +01:00
PsiOmega
255b91553b Merge remote-tracking branch 'upstream/dev' into PAP 
Fixes #6844.
 2014-11-14 13:33:59 +01:00
PsiOmega
1140a709dd Portable Turret Fixes 
Constructed turrets begin offline.
(Un)wrenching turrets now take time.
If a turret has at least one controller then it cannot individually be turned on/off or set to lethal stun.
Uses the additional Topic-arg to make it possible for turret covers to call the actual turret Topic proc.
 2014-11-14 13:25:57 +01:00
PsiOmega
0f620c9b56 Filled PAPs 
There now exists pre-filled portable airpumps, mainly to be used by the ERT.
 2014-11-14 09:26:39 +01:00
Chinsky
47b5dcfd86 Merge pull request #7016 from PsiOmegaDelta/SecRec 
Relocates lasercolor snowflakes
 2014-11-14 11:21:55 +03:00
Chinsky
0b8236da3b Merge pull request #7017 from PsiOmegaDelta/SafeResearch 
Research Safety
 2014-11-14 11:21:47 +03:00
Chinsky
69ff886235 Merge pull request #7005 from mwerezak/door 
Fixes door projectile damage
 2014-11-14 11:21:30 +03:00
Chinsky
7261bcbd05 Merge pull request #6975 from Ccomp5950/restrict_ai_ert_shuttle 
AI's no longer able to use specop's shuttle console.
 2014-11-14 11:20:29 +03:00
Chinsky
2431c930d3 Merge pull request #7007 from mwerezak/helmet 
Makes helmet icon south state consistent with east/west states
 2014-11-14 11:19:29 +03:00
Chinsky
b45c04fdd6 Merge pull request #7009 from mwerezak/coffee 
Makes vending machine coffee price in line with other items
 2014-11-14 11:19:16 +03:00
Chinsky
4f81000f6d Merge pull request #7012 from mwerezak/slime-hear 
Cleans up slime saycode clutter
 2014-11-14 11:18:57 +03:00
Chinsky
43ee395c48 Merge pull request #7013 from Raptor1628/dev 
ERT Update
 2014-11-14 11:18:50 +03:00
Chinsky
1640b0a1c1 Merge pull request #7015 from Zuhayr/attackverbremoval 
Attack proc removal/refactor.
 2014-11-14 11:18:43 +03:00
MrSnapwalk
7c50b2a010 Adds FearTheBlackout/Devildabeast's custom item. 2014-11-13 12:35:42 -06:00
PsiOmega
c9ef7266fe Map Fixes 
Corrects a merge conflict.
Makes it possible for the CE to unbolt the engine core hatches.
 2014-11-13 18:18:42 +01:00
GinjaNinja32
5811122619 Fixes robot movement caused by non-self using power 2014-11-13 14:52:13 +00:00
PsiOmega
c1393fb3a2 Relocates lasercolor snowflakes. 
Relocates some of the laser tag assessment code into more relevant areas.
Portable turrets are no longer considered fully emagged while in lethal mode. Affects target assessment.
Fixes an issue with turret control windows not refreshing.
 2014-11-13 13:11:42 +01:00
PsiOmega
7bf33f98e4 Research Safety 
Research build paths are now type safe. ensuring the object type that is to be constructed always exists.
 2014-11-13 12:42:08 +01:00
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr
82090d2de2 Fixed some issues with previous commits, gave aliens and animals an attack proc, removed now-unused stungloves from attack_hand procs. 2014-11-13 21:01:55 +10:30
Zuhayr
4bb4145f5d Readded interactions for slimes and monkeys using attack_generic proc. 2014-11-13 19:18:34 +10:30
Atlantiscze
59077c5b51 Buildable robot analyzers 
- Robot analyzers can now be built using Protolathe. They are low-mid level tech, requiring quite small research levels and no rare materials.
 2014-11-13 08:45:45 +01:00