cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,392 Commits 2 Branches 1 Tag
0624fced644fb2388c91a54dbe7dfee71df98c18
Commit Graph

11520 Commits

Author SHA1 Message Date
Zuhayr
0c0e197657 Seed packets are now generated via masks 2015-02-04 10:44:59 +10:30
Zuhayr
92d00eb87d Tweaks and fixes for growth and icon generation. 2015-02-04 10:44:16 +10:30
Zuhayr
f978e782f1 Tweaks. Trays now display their status when examined rather than attacked with an empty hand. 2015-02-04 10:44:00 +10:30
Zuhayr
06f26604d1 Xenoflora is now a sub-department of Xenobio rather than Science. 2015-02-04 10:43:50 +10:30
Zuhayr
983ca55c9d Autopopulates the plant and product icon lists at roundstart. Should make missing plant icons obnoxiously easy to spot due to a world output in bright red. 2015-02-04 10:43:33 +10:30
Zuhayr
b3e31bfa14 Reduced darkness of hydro icons. 2015-02-04 10:43:25 +10:30
Zuhayr
e5935e01f1 Span classes. 2015-02-04 10:43:01 +10:30
Zuhayr
78e61d9ccd Tweaks to xenoflora, added plant icons and colours to all plants. 2015-02-04 10:42:39 +10:30
Zuhayr
3c9bfbc751 Merge branch 'xenohydro_repair' into xenohydro 2015-02-04 10:40:37 +10:30
Zuhayr
26fe1a11a4 Adds exploding fruits. 2015-02-04 10:39:14 +10:30
Zuhayr
5538ce5589 Refactored nettles and sunflowers into regular plants. 2015-02-04 10:38:56 +10:30
Zuhayr
7bc70f46b0 Tweaks/fixes for fruit effects. 2015-02-04 10:37:54 +10:30
Zuhayr
b791c92c6e Added a fruit spawning debug proc. 2015-02-04 10:37:40 +10:30
Zuhayr
4791ef2b74 First pass on xenoflora expansion. 2015-02-04 10:37:37 +10:30
Ravensdale
84fa5379c5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-03 15:18:27 -08:00
PsiOmega
0ec47b225f Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/setup.dm
 2015-02-04 00:00:17 +01:00
Ravensdale
2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
PsiOmega
566f6a104e Carded AIs can no longer access cameras through camera consoles. 
Also includes fixes for hidden uplinks.
 2015-02-03 23:44:35 +01:00
Zulker Nayeen Nahiyan
0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
 2015-02-04 04:44:09 +06:00
Kelenius
cb25b524ab Gives slimes a HUD and an ability to choose face 2015-02-04 01:39:30 +03:00
PsiOmega
a7a33e0a35 Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/modules/mob/dead/observer/observer.dm
 2015-02-03 22:28:53 +01:00
PsiOmega
ffa13c68cb Merge remote-tracking branch 'upstream/dev' into CanTrack 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 22:27:22 +01:00
Kelenius
c69bdd81a8 Working conflict fix 2015-02-03 23:38:35 +03:00
Kelenius
c9824f62df Conflict fix 2015-02-03 23:29:08 +03:00
GinjaNinja32
7f12c68a4b Remove ethanol from chem synthesis 
Done on mobile. Might break.
 2015-02-03 19:58:20 +00:00
Kelenius
9edb5751fb Adds tobacco and maps in drying racks 2015-02-03 22:24:49 +03:00
PsiOmega
21a0aa05e5 Topic now uses the NanoUI can_interact_with_interface() proc to determine functionality. 
can_interact_with_interface() has been updated with the old canUseTopic() checks.
 2015-02-03 20:24:11 +01:00
Kelenius
536388978f Conflict fix 2015-02-03 20:57:16 +03:00
PsiOmega
9da907cef4 Breaks out NanoUI interaction checks into proper procs instead of type checks. 2015-02-03 18:56:35 +01:00
Kelenius
0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03:00
GinjaNinja32
95ec6a4dfe Changes cure mechanism 2015-02-03 16:41:08 +00:00
GinjaNinja32
37f47fd3fa Merge remote-tracking branch 'upstream/dev' into viro 2015-02-03 16:28:10 +00:00
PsiOmegaDelta
021096d924 Merge pull request #7841 from comma/firefirEFIREBURNAHAHAHA 
Ported TG's code for burny mobs, by ergovisavi.
 2015-02-03 17:02:09 +01:00
Chinsky
71b19d5d8f Stupid typo & missing constants 2015-02-03 18:44:26 +03:00
GinjaNinja32
c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro 
Conflicts:
	code/modules/virus2/disease2.dm
 2015-02-03 15:33:37 +00:00
PsiOmegaDelta
24a7f5b5f0 Merge pull request #7938 from LethalGhost/dev 
More convenient give verb.
 2015-02-03 16:32:20 +01:00
Chinsky
84472462ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 18:30:18 +03:00
GinjaNinja32
fa75cb9fab Change beakers, bottles, syringes and vials to use /image and multiplicative blending 2015-02-03 15:23:48 +00:00
Chinsky
576f9c84a3 Merge pull request #8016 from PsiOmegaDelta/Impersonation 
Voice changer impersonation now works.
 2015-02-03 18:16:23 +03:00
Chinsky
95ff9570ee Merge pull request #7930 from RKF45/newpaint 
Generic paint
 2015-02-03 18:15:42 +03:00
Chinsky
5ed006bcf0 Merge pull request #7902 from Kelenius/ofCratesAndMastermind 
Changes abandoned crate contencs and replaces minispess with mastermind
 2015-02-03 18:15:35 +03:00
Chinsky
889fee1b82 Merge pull request #7983 from PsiOmegaDelta/SynthStamp 
Timestamped AI radio messages.
 2015-02-03 18:14:44 +03:00
Chinsky
28ee1be312 Merge pull request #7952 from PsiOmegaDelta/AIEye 
Observers can now see the AI eye
 2015-02-03 18:14:08 +03:00
Chinsky
b6ca496a93 Merge pull request #7617 from fira/obscomps 
Observers Improvements: Ghosts are able to spy on computers, SMES and APCs, with NanoUI and OldUI support
 2015-02-03 18:12:16 +03:00
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes 
refactor buckling + glowy HE pipes
 2015-02-03 18:12:09 +03:00
PsiOmegaDelta
dd52f970e2 Merge pull request #7856 from mwerezak/emote 
Adds ^ say shortcut for visible emotes
 2015-02-03 16:11:36 +01:00
Chinsky
74df9669a0 Merge pull request #7719 from Zuhayr/species_tweaks 
Species tweaks.
 2015-02-03 18:11:18 +03:00
Chinsky
ac8043d926 Merge pull request #7767 from Amunak/research 
Allows printing lists of current research levels and technologies
 2015-02-03 18:11:06 +03:00
Chinsky
fb929a9688 Merge pull request #7796 from Kelenius/ofVendorsAndSeeds 
Replaces seed vendors with seed storages
 2015-02-03 18:10:57 +03:00
PsiOmegaDelta
70e8efb9fa Merge pull request #8018 from GinjaNinja32/ai 
Adds AI latejoin
 2015-02-03 16:10:46 +01:00