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,963 Commits 6 Branches 0 Tags
e7d85f8edc7a38caccfd3e82a2fbba9c36595fa1
Commit Graph

18056 Commits

Author SHA1 Message Date
PsiOmega
9181a2a43a Fixes atom pooling return code. 2015-04-11 10:28:15 +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
Chinsky
690da7e42d Merge pull request #8802 from PsiOmegaDelta/ISawTheRuntimes 
Eye runtime fixes.
 2015-04-11 02:05:51 +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
080b0178ab Fixes issue with the alarm monitor (only sometimes) listing a null missing alarm source. 2015-04-10 15:19:55 +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
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
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
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
Chinsky
5fc3a2a511 Merge pull request #8792 from GinjaNinja32/runtime 
Runtime fixes
 2015-04-10 12:24:35 +03:00
Chinsky
c233e1579e Merge pull request #8793 from GinjaNinja32/recipes 
Fixes dough and synthmeat recipes to correctly generate multiple products
 2015-04-10 12:24:27 +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
volas
2f8bc856a5 Small fix after merge 2015-04-09 21:07:43 +03:00
GinjaNinja32
de5104685f Fixes atmos supply control consoles 
Fixes #8400
 2015-04-09 17:05:27 +01:00
GinjaNinja32
4784dd8f95 Fixes dough and synthmeat recipes to correctly generate multiple products 
Fixes #8786
 2015-04-09 16:28:06 +01:00
GinjaNinja32
b35fe67be8 Fixes robot Life() runtime 
Fixes #8610
 2015-04-09 16:08:33 +01:00
GinjaNinja32
958a1c64b3 Fixes PDA detonation runtime 
Fixes #8609
 2015-04-09 16:05:53 +01:00
GinjaNinja32
9bd93dbb29 Removes duplicate virus food recipe, adjusts correct recipe 
Fixes #8590
 2015-04-09 16:01:19 +01:00
GinjaNinja32
a377806b47 Fixes PACMAN UI initial data 
Fixes #8561
 2015-04-09 15:58:07 +01:00
GinjaNinja32
7483b9fcb2 Fixes hardsuits completely breaking all the time 2015-04-09 13:58:10 +01:00
Chinsky
e6f83f8fa2 Merge pull request #8707 from PsiOmegaDelta/Garbage 
Ports /vg/&/tg/'s garbage collector.
 2015-04-09 08:50:12 +03: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
GinjaNinja32
6699cab7bf Adds selectable default languages to all mobs which can speak 
Set-Default-Language verb to set, Check-Default-Language verb to check
There are also links to set and reset in Check-Known-Languages
 2015-04-08 15:18:59 +01: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
fe0185697e Some dislocation fixes/adjustments. 2015-04-07 19:50:26 -07: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
mwerezak
d683bb07af Allows dislocating joints using a neck grab + disarm 2015-04-07 15:46:42 -04:00
mwerezak
81bcad2b33 attackhand cleanup 2015-04-07 15:12:32 -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
Chinsky
59e58c53aa Merge pull request #8764 from PsiOmegaDelta/logs 
Rune logging.
 2015-04-07 21:40:15 +03:00
Yoshax
bb9a418ed0 Fixes blue, removes commented out code, gives file a meaningful name. 2015-04-07 13:54:22 +01:00