cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,955 Commits 5 Branches 0 Tags
d381eb6083bd4198f33fcbb577154646cbcf7c58
Commit Graph

10815 Commits

Author SHA1 Message Date
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega
2ddf8ecf28 Movement fixes. 
Ensures observers use Process_Incorpmove() despite being dead, while disallowing the once living from doing the same.
Ensures incorporeal creatures denied moving unto holy ground don't keep calling more movement code.
 2015-04-15 14:21:58 +02:00
Zuhayr
20cfea7813 Merge pull request #8852 from PsiOmegaDelta/AutoGhost 
Moving while dead now auto-ghosts you.
 2015-04-15 19:59:38 +09:30
Chinsky
3f93454017 Merge pull request #8849 from PsiOmegaDelta/GhostPossess 
Allow admins to drag-drop ghosts into mobs.
 2015-04-15 12:46:56 +03:00
PsiOmega
d8f1045e53 Moving while dead now auto-ghosts you. 
Also removes now redundant incorporeal_move check that's made further up the proc.
 2015-04-15 09:19:19 +02:00
PsiOmega
0d0786dfa1 Allows dead humans to speak, even if muzzled. 
Prevents a fate most cruel, at least when the ghost is still possessing its dead body.
 2015-04-15 09:06:04 +02:00
PsiOmega
f9b3547e8d Allow admins to drag-drop ghosts into mobs. 
This functions the same way as editing the ckey in vv.
Has the same permission check as assume-direct-control.
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
 2015-04-15 08:49:00 +02:00
Chinsky
b94366067a Merge pull request #8840 from PsiOmegaDelta/NanoI 
Fixes NanoUI interaction.
 2015-04-15 02:12:12 +03:00
PsiOmega
516b60962e Merge remote-tracking branch 'upstream/dev' into CultPorting 2015-04-14 15:54:22 +02:00
Chinsky
d408886333 Merge pull request #8837 from Techhead0/voidtank 
Voidsuit Examine info.
 2015-04-14 16:36:44 +03:00
Chinsky
32534346c7 Merge pull request #8773 from mwerezak/dislocation 
Adds dislocating joints using a neck grab
 2015-04-14 16:35:24 +03:00
Chinsky
a601c50f08 Merge pull request #8839 from PsiOmegaDelta/PAPs 
Camera network refactor - Part 3 - Final
 2015-04-14 16:32:14 +03:00
PsiOmega
0466a1f47a Camera network refactor - Part 3 
Swept through every single Z-level, re-named/networked every single camera.
Fixes the AI Jump-To-Network verb not properly updating the network (used by the Show-Camera-List verb).
Also removes redundant Cancel option in the Show-Camera-List.
 2015-04-14 11:41:01 +02:00
PsiOmega
aa5d5d5256 Fixes NanoUI interaction. 
A number of machinery objects were returning STATUS_INTERACTIVE instead of parent.
Fixes missing subtype definition for /var/global/datum/topic_state/default/default_state.
 2015-04-13 23:19:22 +02:00
mwerezak
d6498cd45f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation 
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/human_organs.dm
 2015-04-13 17:12:02 -04:00
mwerezak
da5518f8b2 Updates various dependencies on organ brokenness to use the is_broken() proc. Updates external organ brokenness to ensure broken description is set. 2015-04-13 16:38:33 -04:00
Techhead0
d27f7ef799 Voidsuit Examine info. 
Examining voidsuits will tell you what items are installed (with tiny icons) and the pressure of any installed tanks.
 2015-04-13 11:08:07 -04:00
Zuhayr
03b85a5cb4 Merge pull request #8835 from Zuhayr/dev 
Removed some cocked up files.
 2015-04-13 23:02:41 +09:30
Zuhayr
7129feb417 Removed some cocked up files. 2015-04-13 22:58:32 +09:30
PsiOmegaDelta
095a572c71 Merge pull request #8829 from Techhead0/voidtank 
Installable Voidsuit tanks.
 2015-04-13 13:57:56 +02:00
GinjaNinja32
d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm
 2015-04-13 12:49:07 +01:00
Techhead0
c8487db13b Eject Tank verb and span classes 
Now you can eject your tank onto the ground while wearing the suit.
Toggle Helmet verb now uses span classes.
 2015-04-13 05:02:20 -04:00
PsiOmegaDelta
f988545ed5 Merge pull request #8827 from comma/dev-freeze 
Some fixes
 2015-04-13 08:17:53 +02:00
Chinsky
10699ccfa3 Fixes #8473 
..() doesn't really do anything meaningful, so it always returned null. Left it there just in case, but at least now it doesn't stop un-lightening.
 2015-04-13 07:35:23 +03:00
Chinsky
271977dd7e Fixes #8537 
Apparently drying racks don't actually do anything, but at least now they can do nothing on all the grown fruits! Also added some darkening so people feel like they were slightly less cheated.
 2015-04-13 07:19:40 +03:00
Chinsky
d6d005db6a Fixes #8550 2015-04-13 06:41:58 +03:00
Chinsky
d39cc9686d Fixes #8687 2015-04-13 06:25:30 +03:00
Chinsky
b436925a33 Fixes #8735 2015-04-13 03:54:29 +03:00
Chinsky
870b090d36 Merge pull request #8782 from volas/dev 
Small fix after merge
 2015-04-12 21:18:14 +03:00
Chinsky
2dea2424cb Merge pull request #8811 from Zuhayr/dev 
Adds construction drones.
 2015-04-12 18:21:34 +03:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake. 
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
 2015-04-12 16:19:16 +02:00
PsiOmega
6458d91d83 Fixes AIs inside inteliCards being unable to interact with the world around it. 
Apparently being inside an object affects view() in unexpected ways.
 2015-04-12 14:04:00 +02:00
Zuhayr
0223223c77 Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff 
Revenge of the Research Module (and other stuff from that PR)
 2015-04-12 13:16:45 +09:30
Zuhayr
1758f52123 Fixes errors in previous commit, makes some tweaks. 2015-04-12 13:09:03 +09:30
Zuhayr
e833c14975 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-04-11 22:19:24 +09:30
PsiOmega
f3be9b41f0 Ports /vg/'s Nas-Sie remake. 
First phase: Port cultify procs.
 2015-04-11 13:58:08 +02:00
Zuhayr
a029f88cfc Added construction drone variant, updated the construction area map slightly. 2015-04-11 19:20:13 +09:30
=
78987a436a Merge resolution. 2015-04-11 13:23:17 +09:30
Chinsky
7a40d193fe Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen 
Refactors NanoUI interaction (again)
 2015-04-11 04:43:50 +03:00
Chinsky
c9fc94e1ff Merge pull request #8803 from Zuhayr/dev-freeze 
Readds vox pariah.
 2015-04-11 04:21:13 +03:00
Chinsky
be3f372680 Merge pull request #8788 from PsiOmegaDelta/PortedSpells 
Ports /vg/'s spell system for use by the cult port.
 2015-04-11 02:05:58 +03:00
Chinsky
690da7e42d Merge pull request #8802 from PsiOmegaDelta/ISawTheRuntimes 
Eye runtime fixes.
 2015-04-11 02:05:51 +03:00
PsiOmega
49d3f0fcf7 Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen 2015-04-10 15:49:36 +02:00
PsiOmega
1ba8dcbca9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/vending.dm
 2015-04-10 15:25:34 +02:00
PsiOmega
080b0178ab Fixes issue with the alarm monitor (only sometimes) listing a null missing alarm source. 2015-04-10 15:19:55 +02:00
Zuhayr
d70ea77c2d Moved stack into heist antag creation for pariah reinclusion. 2015-04-10 02:35:04 -07:00
PsiOmega
baa2fe0dfa Eye runtime fixes. 
Ensures the spawn in ai/New() doesn't attempt to update eyeobj if the AI was deleted before the timer.
 2015-04-10 11:29:50 +02:00
Zuhayr
e4a0edb309 Readds CAN_JOIN to Vox for Ikky. 2015-04-10 02:28:38 -07:00
Chinsky
d422ecd5aa Merge pull request #8791 from GinjaNinja32/virusfood 
Removes duplicate virus food recipe, adjusts correct recipe
 2015-04-10 12:25:08 +03:00
Chinsky
4c4d4b9f2c Merge pull request #8790 from GinjaNinja32/pacman 
Fixes PACMAN UI initial data
 2015-04-10 12:25:02 +03:00