cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 05:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,515 Commits 8 Branches 26 Tags
fc4e6796ce2ca799da5f4321c1dd063db60c0879
Commit Graph

4884 Commits

Author SHA1 Message Date
Chinsky
fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano 
NanoUI/Topic make-over
 2015-02-06 00:15:04 +03:00
PsiOmega
a073cba477 Merge remote-tracking branch 'upstream/dev' into CanHasNano 
Conflicts:
	code/setup.dm
 2015-02-05 12:37:15 +01: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
PsiOmega
0ec47b225f Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/setup.dm
 2015-02-04 00:00:17 +01: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
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
Kelenius
0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03: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
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
Chinsky
576f9c84a3 Merge pull request #8016 from PsiOmegaDelta/Impersonation 
Voice changer impersonation now works.
 2015-02-03 18:16:23 +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
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
PsiOmegaDelta
70e8efb9fa Merge pull request #8018 from GinjaNinja32/ai 
Adds AI latejoin
 2015-02-03 16:10:46 +01:00
Chinsky
a5ad6daba5 Merge pull request #7739 from Zuhayr/dev 
Readds moonwalking.
 2015-02-03 18:09:25 +03:00
PsiOmega
a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
PsiOmega
1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge 
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
 2015-02-03 14:16:14 +01:00
Chinsky
649473e0ec Restred medical side effects file since turns out it's used (need to look into why it doesn't appear to be later) 2015-02-03 12:19:09 +03:00
Chinsky
72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
GinjaNinja32
271fe31e64 Admin verb to toggle latejoin-ability. Wipe Core disallowed in malfunction. 2015-02-02 18:34:26 +00:00
GinjaNinja32
6ea6c82897 AI latejoin 2015-02-02 17:59:57 +00:00
PsiOmega
8121ef363d Voice changer impersonation now works. 2015-02-02 13:09:24 +01:00
PsiOmega
eca4265abe Merge remote-tracking branch 'upstream/dev' into CanTrack 
Conflicts:
	code/game/machinery/camera/tracking.dm
 2015-02-02 08:15:41 +01:00
volas
ea8e848463 copytext() check for some input 2015-02-01 23:16:04 +03:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
mwerezak
1f869ebe1a Mob fire adjustments 
Temperature increase caused by being on fire is now affected by
get_heat_protection().
If a mob is on fire but it's fire_stack <= 0 then it gets extinguished,
just in case.
 2015-02-01 12:11:43 -05:00
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
Chinsky
a5219535f6 Merge pull request #7997 from mwerezak/fixes 
Fixes voidsuit attachment deployment not checking mob_can_equip()
 2015-01-31 09:25:16 +03:00
mwerezak
75e0458102 Fixes voidsuit attachment deployment not checking mob_can_equip() 2015-01-30 22:02:07 -05:00
Chinsky
b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass 
Removes FPRINT and TABLEPASS flags
 2015-01-30 16:17:41 +03:00
PsiOmega
151b8ddd52 Timestamped AI radio messages. 
Radio messages received by the AI are now timestamped.
 2015-01-29 10:21:17 +01:00
PsiOmega
fb84e5f50a Ghosts now have more sight options. 
Can now toggle between the following modes:
* See other observers + AI eye + darkness
* See only darkness
* No darkness
 2015-01-29 09:11:39 +01:00
Zuhayr
b280cb6d42 Fixes #7919 2015-01-29 11:27:56 +10:30
Zuhayr
d0f76833d9 Fixes #7976 2015-01-29 11:15:18 +10:30
GinjaNinja32
bc0f5762be Camera sorting improvements 2015-01-28 04:33:31 +00:00
Chinsky
34a7549460 Merge pull request #7963 from Baystation12/dev-freeze 
freeze->warlock
 2015-01-27 21:56:07 +03:00
Chinsky
c7aff28ffe Merge pull request #7962 from Baystation12/master 
master->freeze
 2015-01-27 21:55:46 +03:00
Lethal Ghost
f8ad509eb7 Update give verb (text lines). 
Replace the outdated macros with span classes.
 2015-01-27 19:51:24 +05:00
PsiOmega
f6b3bfce1c The AI eye now has a sprite. 
Also defines new (see_)invisibility levels for the AI eye, to ensure that cultists visiting the other side cannot suddenly see it while still allowing observers to.
Uses a black and white version of the face hologram as placeholder.
 2015-01-26 22:28:13 +01:00
Loganbacca
8c53e30cfa Fixes telekinetic cat stealing 2015-01-26 19:53:42 +13:00
Loganbacca
37ceccf5a4 Fixed removed items being put inside borgs 2015-01-26 18:24:12 +13:00