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

18812 Commits

Author SHA1 Message Date
Chinsky
bae5bf8b4a Monkeys are scoopable again. 2015-05-26 13:44:01 +03:00
PsiOmegaDelta
2b749602c7 Merge pull request #9475 from Zuhayr/paiscoop 
Allows pAIs to be scooped up and worn as hats.
 2015-05-26 12:39:05 +02:00
PsiOmega
62185bc0a8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-26 08:35:32 +02:00
PsiOmega
5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/toys.dm
 2015-05-26 08:26:48 +02:00
Ccomp5950
fff9e5ec92 Merge pull request #9463 from PsiOmegaDelta/SinfulLiving 
Fixes #9461.
 2015-05-26 02:11:31 -04:00
Zuhayr
0104de03d4 Allows pAIs to be scooped up and worn as hats. 
Readds missing monkey inhands
Standardized get_scooped() calls to mousedrop instead of attack_hand.
Changelog.
 2015-05-26 15:15:15 +09:30
Zuhayr
1b4b428fe9 Removed several unneeded icons from inhands, split holder icons into their own file. 2015-05-26 14:05:21 +09:30
Zuhayr
7ab8a380bd Addendum to custom synth icon commit. 2015-05-26 14:04:51 +09:30
Zuhayr
46714274c3 Moved custom synth icons to the custom items repo. 2015-05-26 14:03:06 +09:30
StarSmasher
711ad88903 Fixes #9294 
Adding 6 tomato juice to 50 protein doesn't really work if the maximum is 50.
Also fixed it in the vegetable pizzas.

Figured a quickfix would be better than a very delayed fix.
 2015-05-25 22:26:55 +02:00
PsiOmegaDelta
ccf5945944 Merge pull request #9362 from Kelenius/ofResearchAndPrototypes 
Updates to science
 2015-05-25 19:55:01 +02:00
Chinsky
d4eb0e82bb Merge pull request #9293 from RavingManiac/dev 
Emote, say() and visible_message() refactor, tape recorder upgrade
 2015-05-25 20:53:04 +03:00
Kelenius
ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
 2015-05-25 20:35:46 +03:00
PsiOmega
4956af8597 Fixes #9461. 
Corrects the path of the uplink item.
 2015-05-25 17:59:41 +02:00
PsiOmegaDelta
b934258adc Merge pull request #9458 from Zuhayr/ipc 
Fixes IPC lack of frailty.
 2015-05-25 09:43:20 +02:00
Zuhayr
76c3fecf9a Fixes IPC lack of frailty. 2015-05-25 17:07:04 +09:30
Zuhayr
f32a8493c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into posibrains 2015-05-25 16:50:04 +09:30
Zuhayr
88b3019e6c Adds ghost click to posibrains. 
Added ghost trap system used by plants and posibrains to get players. Added attack_ghost() to hydro trays and posibrains for the aforementioned.
Changelog.
Minor typo.
Topic fixes.
Minor fix.
 2015-05-25 16:49:22 +09:30
Zuhayr
d6e3df5fba Attempting to guarantee immunity to viruses for virus_immune var. 2015-05-25 15:52:51 +09:30
Zuhayr
74dfd82072 Organ cleanup, stat to DEAD, world removal 2015-05-25 14:50:02 +09:30
Zuhayr
7dd86c9147 Readded preview icon for IPC, added language and blurb. 
Added welder/fuel checks to relevant surgery.
 2015-05-25 14:50:00 +09:30
Zuhayr
f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general. 
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
 2015-05-25 14:49:57 +09:30
Zuhayr
aa97778f0a Fixes #9433 2015-05-25 14:49:07 +09:30
Zuhayr
958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags. 
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
 2015-05-25 14:49:07 +09:30
Zuhayr
3cae318716 Merge pull request #9370 from comma/frankenstein 
Frankenstein
 2015-05-25 13:56:40 +09:30
mwerezak
c08774d96e Updates bear traps 
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.

Conflicts:
	baystation12.dme
 2015-05-24 16:33:41 -04:00
Zuhayr
161af35d6c Merge pull request #9416 from Hubblenaut/dev 
Makes mice pick up-able
 2015-05-25 02:25:37 +09:30
Chinsky
b01c3a4ba9 Merge pull request #9451 from PsiOmegaDelta/Tmp 
Fixes #9447.
 2015-05-24 18:16:08 +03:00
Chinsky
7835afc361 Merge pull request #9450 from mwerezak/workboots 
Adds engineering workboots
 2015-05-24 18:16:00 +03:00
Hubblenaut
7a8bbab694 fixup 2015-05-24 15:39:43 +02:00
PsiOmegaDelta
9a8a6a601b Merge pull request #9441 from GinjaNinja32/hardsuit_click 
Changes hardsuit activation button to a per-client toggle.
 2015-05-24 14:43:34 +02:00
PsiOmegaDelta
3d9aa48f49 Merge pull request #9442 from GinjaNinja32/shuttle 
Supply shuttle and crate fixes
 2015-05-24 14:43:15 +02:00
PsiOmegaDelta
2fc50e7d03 Merge pull request #9449 from mwerezak/airlock-sound 
Airlock sounds
 2015-05-24 14:43:09 +02:00
PsiOmega
c21a456379 Fixes #9447. 
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
 2015-05-24 11:33:54 +02:00
mwerezak
b4c88c6186 Adds engineering workboots 
Sprites credit ChessPiece.
 2015-05-23 23:00:26 -04:00
mwerezak
e6be73ac56 Airlock sounds 2015-05-23 22:59:18 -04:00
GinjaNinja32
4bad50e875 Gives AI/borg previews back their cardborg hats 2015-05-23 20:42:51 +01:00
GinjaNinja32
3b81d0987b soft_assert addition 2015-05-23 19:41:42 +01:00
PsiOmega
5ee1e3df56 Fixes #9443. 
Restores an old sunflower sprite for use by toys.
 2015-05-23 19:38:31 +02:00
GinjaNinja32
3fb3a18f05 Supply shuttle and crate fixes 
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
 2015-05-23 16:15:04 +01:00
GinjaNinja32
11af65d1e0 Changes hardsuit activation button to a per-client toggle. 
Currently toggleable between:
- middle-click (default)
- alt-click
- control-click
 2015-05-23 14:00:09 +01:00
Kelenius
5be2bd6a1b Updates to properly DA materials 2015-05-23 15:21:11 +03:00
Zuhayr
5b8bf58d0d Merge pull request #9439 from Baystation12/dev-freeze 
Dev-freeze into dev.
 2015-05-23 21:40:26 +09:30
Zuhayr
50dd6aa0bb Merge with master. 2015-05-23 21:29:40 +09:30
Zuhayr
d4e45fbee8 Merge pull request #9327 from Techhead0/chemRenames 
Replaces gaseous reagents with organic chemistry ones, adjusts flammable chemicals.
 2015-05-23 20:52:58 +09:30
Zuhayr
cd86cad68c Merge pull request #8816 from atlantiscze/nanocrusade-two 
Nano Crusade 2
 2015-05-23 20:44:28 +09:30
Zuhayr
a2571b95c3 Merge pull request #9418 from mwerezak/port-gen 
Fixes portable generators going above their temperature limit
 2015-05-23 20:40:07 +09:30
Hubblenaut
7564dcf843 Fixes merge conflict 2015-05-22 21:36:48 +02:00
Kelenius
3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
 2015-05-22 19:26:39 +03:00
Hubblenaut
a7ad448293 mice are pickup-able 2015-05-22 17:59:06 +02:00