cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,995 Commits 2 Branches 1 Tag
ee0d63a43d32dfde7ab3ee3bb4e1497c59a5cfdc
Commit Graph

4241 Commits

Author SHA1 Message Date
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
PsiOmega
b38d8495b3 Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather 
Conflicts:
	code/game/gamemodes/game_mode.dm
	code/modules/clothing/spacesuits/rig/suits/merc.dm
 2015-02-23 17:38:50 +01:00
PsiOmega
5be726753f Updates paths after the projectile update. Adds rig modules to the uplink. 2015-02-23 17:33:12 +01:00
Chinsky
b5dda2b793 Merge pull request #8180 from mwerezak/mercenary 
Map updates and fixes, plus hardsuit icons
 2015-02-23 15:27:35 +03:00
PsiOmegaDelta
bbbde676d5 Merge pull request #8200 from mwerezak/devfixes 
Misc dev updates
 2015-02-23 10:15:42 +01:00
mwerezak
6c4d16774f Merge remote-tracking branch 'upstream/dev' into mercenary 
Conflicts:
	code/game/objects/items/devices/uplinks.dm
 2015-02-22 20:44:43 -05:00
mwerezak
115bbbe669 Nerfs merc sniper rifle and makes it uplink purchasable 
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
 2015-02-22 20:27:06 -05:00
mwerezak
c317fb8c39 Adds ability for uplink purchases to produce more than one item 2015-02-22 20:17:18 -05:00
Chinsky
79917d57b2 Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions 
Rudimentary uplink descriptions.
 2015-02-22 11:32:49 +03:00
Zuhayr
28e7411e2d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-22 16:28:06 +10:30
mwerezak
47cbfdd59e Keeps zone selection and gun mode toggle HUD elements visible when scoped 2015-02-21 16:01:47 -05:00
mwerezak
11719a380e Fixes #8151 2015-02-21 15:49:52 -05:00
Chinsky
4daf7161ad Merge pull request #8191 from PsiOmegaDelta/NanoFix 
Fixes runtime in Topics() when called from non-NanoUI sources.
 2015-02-21 14:34:09 +03:00
Zuhayr
451337476d Merge with dev. 2015-02-21 20:11:35 +10:30
PsiOmega
89da19de8a Fixes runtime in Topics() when called from non-NanoUI sources. 2015-02-21 10:32:20 +01:00
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
PsiOmega
0b9406a089 Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather 2015-02-21 10:17:17 +01:00
PsiOmega
4c8bf16628 Rudimentary uplink descriptions. 2015-02-21 10:16:47 +01:00
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths 
Adds robot synths
 2015-02-21 11:43:39 +03:00
Chinsky
214324eaaf Merge pull request #8156 from PsiOmegaDelta/CameraMove 
Custom ninja spawn points.
 2015-02-21 11:43:19 +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
MrSnapwalk
ee24bdb3b1 Adds the spider plushie - sprite by Bishop. 2015-02-20 21:17:46 -06:00
MrSnapwalk
cf431370f3 Action figure un-refactor, minor fix. 2015-02-20 21:02:26 -06:00
PsiOmega
18521e6983 Now possible to order a kit with a random toxin and syringe - 4TC 2015-02-20 21:13:34 +01:00
PsiOmega
5b299e0104 NanoUI atmosphere control and remote air alarm support. 2015-02-20 17:39:55 +01:00
Kelenius
a0b73140e9 Fixes for synths and decompiler 2015-02-20 13:32:10 +03:00
MrSnapwalk
71f8a5c8e8 Minor fixes, action figure refactor. 2015-02-19 20:37:36 -06:00
Kelenius
1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +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
mwerezak
01784d8d6a Fixes cigar/pipe mob overlays not updating when lit 2015-02-19 00:44:11 -05:00
MrSnapwalk
cc0266c776 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moretoys 
Conflicts:
	code/game/objects/random/random.dm
 2015-02-18 19:02:23 -06: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
Akai Alonkai
c6b66a1000 Defines icon file for purple comb 
Fixes #8133
 2015-02-18 15:09:40 -05:00
PsiOmega
958391d06b Custom ninja spawn points. 
The ninja should no longer risk spawning far away from the station, with no clue where to go to reach it.
 2015-02-18 08:14:40 +01: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
Zuhayr
ae1161184c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-18 14:17:39 +10:30
MrSnapwalk
52072bc7cf Adds action figures, large and small plushies, and the toy cult sword. Adds all new toys to the arcade machine. 2015-02-17 20:38:13 -06:00
Chinsky
eb4a75c9b3 Merge pull request #7986 from Hubblenaut/sprites 
Adds on-sprite belt icons
 2015-02-17 15:22:16 +03:00
Zuhayr
bee187d5bc Merge pull request #8143 from PsiOmegaDelta/NanoAI 
AI NanoUI subsystems.
 2015-02-17 11:50:59 +10:30
Zuhayr
4631e53718 Merge pull request #8140 from comma/undies 
Underwear closet, crossdressing
 2015-02-17 03:03:45 +10:30
Hubblenaut
5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2015-02-16 16:16:30 +01:00
PsiOmega
c6d88bc787 AI NanoUI subsystems. 
Allows sharing of NanoUI code between consoles and the AI (and just about anything else).
 2015-02-16 13:44:04 +01:00
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
PsiOmegaDelta
8e0b2a0235 Merge pull request #8139 from mwerezak/fingerprints 
Adds fingerprints whenever an item is put in a human's hands
 2015-02-16 10:35:01 +01:00
Chinsky
f9ba327c3a Merge pull request #8099 from mwerezak/gun-rewrite 
Gun rewrite
 2015-02-16 11:54:52 +03:00
Chinsky
3f8462a399 Adds a wardrobe structure to pick your underwear. 
Adds ability to wear female underwear as male and vice versa.
Changes 'underwear'/'undershirt' vars to hold iconstate instead of esoteric dances with array indexes.
 2015-02-16 11:17:22 +03:00