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

9426 Commits

Author SHA1 Message Date
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02: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
Chinsky
7cea6b80c0 Merge pull request #8794 from GinjaNinja32/atmos 
Fixes atmos supply control consoles
 2015-04-10 12:24:17 +03:00
PsiOmega
e37c5c22d4 Refactors NanoUI interaction (again) 
Takes NanoUI interaction code and splits it into more manageable modules.

The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
 2015-04-10 11:19:38 +02:00
Kelenius
20d62c87ff Borg module fixes 
Fixes #8775
Fixes #8797
 2015-04-10 09:50:47 +03:00
Neerti
45947bb9f5 Addresses Zuh's issues so he'll stop wracking me. 2015-04-09 21:22:04 -04:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
GinjaNinja32
de5104685f Fixes atmos supply control consoles 
Fixes #8400
 2015-04-09 17:05:27 +01:00
GinjaNinja32
958a1c64b3 Fixes PDA detonation runtime 
Fixes #8609
 2015-04-09 16:05:53 +01:00
Chinsky
3286de0a4f Merge pull request #8766 from PsiOmegaDelta/BetterMath 
Emergency shuttle delay feedback correction.
 2015-04-09 08:15:22 +03:00
Chinsky
7b15bd59e5 Merge pull request #8768 from Yoshax/emergencymessage 
Emergency message changes
 2015-04-09 08:15:19 +03:00
PsiOmega
b52e3168c2 Area/Camera network refactor - Part 2 
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.
Civilian West (vacant office, cargo, primary tool storage, etc., main hallways excluded) updated this run.

Also includes:
All staff offices, including QM's, now have a privacy mode and door buttons.
 2015-04-08 13:20:22 +02:00
PsiOmega
71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
 2015-04-08 10:55:26 +02:00
PsiOmega
66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/cult/runes.dm
 2015-04-08 10:40:38 +02:00
Zuhayr
cee229733e Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev 2015-04-07 18:38:59 -07:00
Chinsky
143f036ccd Merge pull request #8745 from Kelenius/ofLingsAndMeta 
Removes the bullshit ling meta message
 2015-04-08 03:24:15 +03:00
Chinsky
23c20556b4 Merge pull request #8767 from RavingManiac/dev-freeze 
Vending Machine Fixes
 2015-04-08 03:23:40 +03:00
mwerezak
193430bff9 Fixes #8771 2015-04-07 15:55:18 -04:00
Chinsky
175fdf57e6 Merge pull request #8703 from PsiOmegaDelta/Map 
Area/Camera network refactor - Part 1
 2015-04-07 21:41:06 +03:00
Yoshax
bb9a418ed0 Fixes blue, removes commented out code, gives file a meaningful name. 2015-04-07 13:54:22 +01:00
RavingManiac
6482dfb374 EFTPOS scanners now work with IDs in PDAs and wallets 
Vending machine code revised slightly

"\the" added to visible messages where applicable
 2015-04-07 22:09:11 +10:00