cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,529 Commits 2 Branches 1 Tag
3384f13a310d1513935da5599dcfb5c04ff92355
Commit Graph

16912 Commits

Author SHA1 Message Date
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro 
Virology rework
 2015-02-06 00:18:13 +03:00
Chinsky
2100c51905 Merge pull request #8042 from PsiOmegaDelta/HearItSayIt 
Silicons now have some timestamped input
 2015-02-06 00:15:15 +03:00
Chinsky
abd3396a13 Merge pull request #8041 from PsiOmegaDelta/SetMyName 
Silicons can now more easily be correctly renamed.
 2015-02-06 00:15:07 +03:00
Chinsky
fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano 
NanoUI/Topic make-over
 2015-02-06 00:15:04 +03:00
Zuhayr
43d576dcc5 Merge pull request #8054 from mwerezak/chembottles 
Replaces chem bottles with their overlay equivalents
 2015-02-05 23:05:45 +10:30
PsiOmega
a073cba477 Merge remote-tracking branch 'upstream/dev' into CanHasNano 
Conflicts:
	code/setup.dm
 2015-02-05 12:37:15 +01:00
mwerezak
9caf76d069 Glass bottles are now dispensed with the lid on 
It seemed kind of silly that vendors, for example, would dispense
bottles with their lids off.
 2015-02-05 00:41:59 -05:00
mwerezak
8da0fb7f43 Merge remote-tracking branch 'upstream/dev' into chembottles 
Conflicts:
	code/modules/hydroponics/hydro_tools.dm - flags var
 2015-02-05 00:37:19 -05:00
mwerezak
59bbf3a883 Replaces chem bottles with their overlay equivalents 2015-02-05 00:31:56 -05:00
Ravensdale
7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Chinsky
4f541758c6 Merge pull request #8003 from Jamini/dev 
Added Tajran, Lizardfiend, and Slugfiendian depiction transformations for the CE rig
 2015-02-04 18:17:32 +03:00
Chinsky
8a46903231 Merge pull request #7830 from PsiOmegaDelta/CanTrack 
Camera tracking logic cleanup and tracking notice feature.
 2015-02-04 18:17:21 +03:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks 
Adds drying racks, tobacco, and updates pipes
 2015-02-04 18:15:13 +03:00
Chinsky
f1c5c9d08d Merge pull request #7680 from Skully71/chancespawn 
Add a chance spawn object to enable spawning a given object at chance
 2015-02-04 18:14:31 +03:00
Chinsky
82ca870c53 Merge pull request #8028 from GinjaNinja32/beaker 
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
 2015-02-04 18:14:22 +03:00
Chinsky
f386d2eb47 Merge pull request #7979 from PsiOmegaDelta/GhostSight 
Ghosts now have more sight options.
 2015-02-04 17:31:21 +03:00
Ravensdale
fcb2770004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 05:15:23 -08:00
RavingManiac
8bc85c6bca Missing files added 2015-02-04 20:40:39 +08:00
RavingManiac
38d62a278a Holodeck code moved to modules, holo-object code put in separate file. Holodeck expanded from 5x10 to 10x10. Holodeck areas updated accordingly. Holodeck courtroom added. Holodeck gravity can now be toggled. Reduced stun-time from gravity turning on. Changed the thunk() message a bit. Window-doors can now be deleted silently. 
Changelog updated.
 2015-02-04 20:05:43 +08:00
Skully71
3d2abddaa7 Add random single object to enable a given object to be spawned at chance 2015-02-04 10:41:47 +01:00
PsiOmega
f045f5b2e9 Timestamped speech for silicons. 2015-02-04 10:12:01 +01:00
PsiOmega
9352932e3d Timestamped radio for silicons 
All silicons now have timestamped radio messages.
 2015-02-04 10:04:18 +01:00
PsiOmega
1a1bf4a718 Silicons can now be easily renamed. 
Moves the AI SetName proc down silicon level.
 2015-02-04 09:48:30 +01:00
PsiOmegaDelta
1eaf311b25 Merge pull request #7887 from Zuhayr/pickaxes 
Renames pickaxes to drills, resprites accordingly.
 2015-02-04 06:32:37 +01:00
Chinsky
a737dd0ca2 Merge pull request #7800 from Zuhayr/randmap 
Random map generator/distribution map refactor.
 2015-02-04 07:11:45 +03:00
Zuhayr
0091aca22c Merge with dev. 2015-02-04 11:05:35 +10:30
Zuhayr
11ec632c22 Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap 2015-02-04 11:03:44 +10:30
Zuhayr
3402912335 Merge with dev. 2015-02-04 11:03:13 +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
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
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
05532fd330 Merge remote-tracking branch 'upstream/dev' into supply 2015-02-03 17:22:10 +00:00
GinjaNinja32
444c7c71f3 Maps in floor painter in engineering workshop, makes it and pipe painters orderable from Cargo 2015-02-03 17:19:45 +00: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
PsiOmega
49eac0d9ca Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 17:23:04 +01:00
PsiOmega
0d84f836a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-02-03 17:15:02 +01: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