cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-18 01:26:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,075 Commits 66 Branches 25 Tags
d09cd2fe575e54bf64331698af563143522fdc01
Commit Graph
5547 Commits
Author SHA1 Message Date
Zuhayr 15070d729d Dev-freeze into dev merge. 2015-05-30 00:31:12 +09:30
Atlantis 477204e8c8 Fixes two newmalf-related issues 
- Fixes APC runtime. I am an idiot. I know.
- Fixes potentional power issue with AI powersupply object, caused by AI having more than one powersupply. This sometimes caused AI to use 100kW instead of 50kW
 2015-05-29 12:23:39 +02:00
Atlantis 7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
Zuhayr 5ea78421ff Merge pull request #9408 from mwerezak/sm-eject 
Limits the ability of the SM to return to the station zlevel once ejected
 2015-05-28 11:35:39 +09:30
mwerezak 68e205e7b3 Fixes robot limbs spamming sparks and messages endlessly 
Fixes robot limbs spamming malfunctioning messages and spark effects
endlessly if one arm is malfunctioning while holding an item in the
other arm.
 2015-05-27 01:15:14 -04:00
mwerezak 7d4c3235dc Fixes #9460 2015-05-27 01:13:53 -04:00
Chinsky 8eb75ae398 Merge pull request #9480 from Kelenius/ofResearchAndRuntime 
Fixes #9473
 2015-05-27 06:36:50 +03:00
Chinsky bae5bf8b4a Monkeys are scoopable again. 2015-05-26 13:44:01 +03:00
Kelenius f7814e2394 Fixes #9473 
Also: removes automatic shuttle calls when callers are destroyed;
Applies qdel;
Fixes teleporter control console design that probably didn't work
before.
 2015-05-26 09:58:25 +03:00
Zuhayr 0104de03d4 Allows pAIs to be scooped up and worn as hats. 
Readds missing monkey inhands
Standardized get_scooped() calls to mousedrop instead of attack_hand.
Changelog.
 2015-05-26 15:15:15 +09:30
Zuhayr 1b4b428fe9 Removed several unneeded icons from inhands, split holder icons into their own file. 2015-05-26 14:05:21 +09:30
Zuhayr 7ab8a380bd Addendum to custom synth icon commit. 2015-05-26 14:04:51 +09:30
PsiOmegaDelta ccf5945944 Merge pull request #9362 from Kelenius/ofResearchAndPrototypes 
Updates to science
 2015-05-25 19:55:01 +02:00
Chinsky d4eb0e82bb Merge pull request #9293 from RavingManiac/dev 
Emote, say() and visible_message() refactor, tape recorder upgrade
 2015-05-25 20:53:04 +03:00
Kelenius ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
 2015-05-25 20:35:46 +03:00
PsiOmegaDelta b934258adc Merge pull request #9458 from Zuhayr/ipc 
Fixes IPC lack of frailty.
 2015-05-25 09:43:20 +02:00
Zuhayr 76c3fecf9a Fixes IPC lack of frailty. 2015-05-25 17:07:04 +09:30
Zuhayr f32a8493c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into posibrains 2015-05-25 16:50:04 +09:30
Zuhayr 88b3019e6c Adds ghost click to posibrains. 
Added ghost trap system used by plants and posibrains to get players. Added attack_ghost() to hydro trays and posibrains for the aforementioned.
Changelog.
Minor typo.
Topic fixes.
Minor fix.
 2015-05-25 16:49:22 +09:30
Zuhayr 7dd86c9147 Readded preview icon for IPC, added language and blurb. 
Added welder/fuel checks to relevant surgery.
 2015-05-25 14:50:00 +09:30
Zuhayr f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general. 
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
 2015-05-25 14:49:57 +09:30
Zuhayr aa97778f0a Fixes #9433 2015-05-25 14:49:07 +09:30
Zuhayr 958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags. 
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
 2015-05-25 14:49:07 +09:30
Zuhayr 3cae318716 Merge pull request #9370 from comma/frankenstein 
Frankenstein
 2015-05-25 13:56:40 +09:30
Atlantis 1da44dc861 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 
- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.
 2015-05-24 20:23:46 +02:00
Zuhayr 161af35d6c Merge pull request #9416 from Hubblenaut/dev 
Makes mice pick up-able
 2015-05-25 02:25:37 +09:30
Hubblenaut 7a8bbab694 fixup 2015-05-24 15:39:43 +02:00
Atlantis c2c3a2c689 Implements remaining suggestions 
- Few more grammar fixes
- Machine overload adjustment finished. SMESs and APCs now receive explosion intensity bonus according to stored charge.
- Gets rid of remains of old "src:" references in AI Life() proc
 2015-05-24 03:05:27 +02:00
Atlantis ef040583c8 Implements github suggestions 
Among others:
- TXT helpfile is now HTML helpfile
- Lots of gremmer changes
- Some adjustments
 2015-05-23 22:22:38 +02:00
GinjaNinja32 4bad50e875 Gives AI/borg previews back their cardborg hats 2015-05-23 20:42:51 +01:00
Zuhayr 5b8bf58d0d Merge pull request #9439 from Baystation12/dev-freeze 
Dev-freeze into dev.
 2015-05-23 21:40:26 +09:30
Zuhayr 50dd6aa0bb Merge with master. 2015-05-23 21:29:40 +09:30
mwerezak fef7c5ca6c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sm-eject 
Conflicts:
	code/modules/mob/living/living.dm
 2015-05-22 19:38:04 -04:00
Hubblenaut 7564dcf843 Fixes merge conflict 2015-05-22 21:36:48 +02:00
Atlantis 97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
Kelenius 3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
 2015-05-22 19:26:39 +03:00
Hubblenaut a7ad448293 mice are pickup-able 2015-05-22 17:59:06 +02:00
PsiOmega 15756f031b Fixes pulse-check text. 2015-05-22 14:00:42 +02:00
Chinsky be24803309 Merge pull request #9363 from PsiOmegaDelta/PulseCheck 
Pulse check
 2015-05-22 14:35:49 +03:00
PsiOmega 43e0d9ca07 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-22 08:39:07 +02:00
PsiOmega 77099631d1 Updates del usages. 2015-05-22 08:27:12 +02:00
PsiOmega e74c0e65bf Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/power_cells.dm
 2015-05-22 08:26:13 +02:00
mwerezak 4ba4bd8dd3 Replaces nuke disk search_contents_for with a global nuke disk registry 2015-05-22 01:15:04 -04:00
PsiOmega 7d17f2eeb7 Items again have their loc set just before dropped() is called. 
Fixes #9299.
Fixes #9406.
 2015-05-21 17:55:31 +02:00
Daranz e9d9ff57ba Remove redundant null argument in a view() call 2015-05-21 10:14:40 -04:00
RavingManiac 04293467e8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-05-22 00:04:37 +10:00
RavingManiac 839d3b0588 Ability to head blind_message when invisible people do things readded 
Tape recorder playback uses audible_message instead of visible_message
 2015-05-22 00:02:36 +10:00
Daranz bbc8ad6383 Add extra checks for Say :i 
Say :i now leaves fingerprints on affected intercoms, and cannot be performed
at all if restrained.
 2015-05-21 09:18:02 -04:00
Daranz b9dbeeb356 Fix a problem with Say :i not working 2015-05-21 08:53:14 -04:00
Atlantis d8141445e4 Implements suggestions 
- Hardware examine is now generated by hardware's proc.
- Camera network updating now uses proper procs
- Bugfix: APU Generator no longer prevents you from using NanoUI based devices
- Bugfix: Fixes rare runtime on roundstart.
 2015-05-21 13:27:18 +02:00