cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,017 Commits 8 Branches 0 Tags
a3962980ac5b75ba9b51a0d1bb694d26ba6dee3a
Commit Graph

9448 Commits

Author SHA1 Message Date
Chinsky
a3962980ac Merge pull request #8898 from PsiOmegaDelta/eject_cartridge 
Adds a PDA cartridge ejection verb.
 2015-04-19 14:56:59 +03:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
Neerti
b178e56a3b Lazy fix because microwaves are terrible. 2015-04-18 22:04:05 -04:00
PsiOmega
804ca5aa0b Fixes #8250. 
Uncomplicates the examine pre-check.
Ensures door/examine() returns the proper value.
 2015-04-18 19:25:22 +02:00
PsiOmega
c39c929db7 Adds a PDA cartridge ejection verb. 
The most requested feature.
 2015-04-18 18:18:11 +02:00
Chinsky
0206d6db8f Merge pull request #8868 from Jarcolr/patch-2 
Fixes #8633
 2015-04-18 17:44:22 +03:00
Chinsky
3819fe8d03 Merge pull request #8747 from Kelenius/ofJarsAndLizards 
The return of the jars
 2015-04-18 17:01:08 +03:00
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe 
Makes objects without moues opacity not appear via alt-click.
 2015-04-18 16:57:01 +03:00
PsiOmegaDelta
0b6affb274 Merge pull request #8877 from Jarcolr/patch-3 
Fixes #8559
 2015-04-18 15:55:45 +02:00
Chinsky
0d77262c69 Merge pull request #8885 from PsiOmegaDelta/EngineerMasterJob 
Fixes #7943.
 2015-04-18 16:55:06 +03:00
Zuhayr
bc9d1ba38b Merge pull request #8893 from Baystation12/dev-freeze 
Dev freeze into dev
 2015-04-18 21:50:40 +09:30
PsiOmega
f5948f8bb6 Fixes #7943. 
Access to engineering equipment is now enough to manipulate shield generators.
 2015-04-18 11:52:03 +02:00
Jarcolr
1cf3fa4c7a Fixes #8559 
Device.dmi is where the sunflower icon is, this is targeting dev because it is ahead on master on this file.
 2015-04-17 15:55:15 +03:00
Jarcolr
0030ca76af Spans instead of fonts. 
Hopefully no typos.
 2015-04-17 15:34:37 +03:00
GinjaNinja32
159dccbfab Fixes floor painter solid-dark icon 
Fixes #8873
 2015-04-17 03:18:53 +01:00
Kelenius
ec1b6f122c Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards 
Conflicts:
	icons/obj/items.dmi
	maps/exodus-1.dmm
 2015-04-16 19:17:10 +03:00
Kelenius
0c9eb8a112 Minor jar fixes 2015-04-16 17:30:01 +03:00
Jarcolr
9fda2a2614 Fixes #8633 
Hopefully the wording is okay. Targeting dev because this file is ahead on master.
 2015-04-16 17:27:57 +03:00
PsiOmega
3eab61e154 Soap can now clean turfs as well. 2015-04-16 08:20:00 +02:00
GinjaNinja32
54044859bf Fix cryopod moving robots to nullspace instead of deleting 2015-04-15 14:28:36 +01:00
Chinsky
b94366067a Merge pull request #8840 from PsiOmegaDelta/NanoI 
Fixes NanoUI interaction.
 2015-04-15 02:12:12 +03:00
Chinsky
7848a1c300 Merge pull request #8815 from PsiOmegaDelta/CultPorting 
Ports /tg/vg/'s Nas-Sie remake
 2015-04-15 02:12:05 +03:00
Zuhayr
00f6ca5d28 Merge pull request #8836 from PsiOmegaDelta/HighwayToTheDangerZone 
Engineering/police tape can now create floor markings.
 2015-04-14 23:40:11 +09:30
PsiOmega
516b60962e Merge remote-tracking branch 'upstream/dev' into CultPorting 2015-04-14 15:54:22 +02: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
PsiOmega
18e89ff042 Engineering/police tape can now create floor markings. 
Apply tape to floor, get hazard overlay.
Apply tape to the same floor and in the same direction again to remove hazard overlay.
 2015-04-13 15:57:45 +02: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
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
PsiOmega
c616b67621 Map fixes. 
Fixes #8441.
Fixes #8820.
Less stacked pipes.
Medbay now powers all its shutters.
Fixes duplicate req_access definitions.
 2015-04-13 08:44:13 +02:00
PsiOmegaDelta
f988545ed5 Merge pull request #8827 from comma/dev-freeze 
Some fixes
 2015-04-13 08:17:53 +02: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
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
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
Chinsky
0b7ac73f59 Merge pull request #8805 from PsiOmegaDelta/Engineering 
Area/Camera network refactor - Part 3
 2015-04-11 20:49:15 +03:00
PsiOmega
f3be9b41f0 Ports /vg/'s Nas-Sie remake. 
First phase: Port cultify procs.
 2015-04-11 13:58:08 +02:00
=
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
PsiOmega
2836dcf648 Merge remote-tracking branch 'upstream/dev' into Engineering 2015-04-10 16:06:42 +02: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
24fe95933e Area/Camera network refactor - Part 3 
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Engineering/Outpost/Solars updated this run.

Also includes:
Fixes #8727.
 2015-04-10 15:17:05 +02:00
Zuhayr
d70ea77c2d Moved stack into heist antag creation for pariah reinclusion. 2015-04-10 02:35:04 -07:00
Chinsky
05da117d10 Merge pull request #8778 from PsiOmegaDelta/CivilianWest 
Area/Camera network refactor - Part 2
 2015-04-10 12:28:33 +03:00
Chinsky
a8bf62634e Merge pull request #8774 from mwerezak/vending 
Fixes #8771
 2015-04-10 12:28:12 +03:00
Chinsky
5fc3a2a511 Merge pull request #8792 from GinjaNinja32/runtime 
Runtime fixes
 2015-04-10 12:24:35 +03:00