cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,203 Commits 8 Branches 0 Tags
3bf5a5ca990ccf34b17bfcc87914bace22bc0b87
Commit Graph

23203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mwerezak
3bf5a5ca99 Updates storage costs 
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
 2015-03-05 10:40:25 -05:00
PsiOmegaDelta
3be47f5cd9 Merge pull request #8363 from PsiOmegaDelta/dev 
Dev
 2015-03-05 09:39:09 +01:00
PsiOmega
3e9f33136a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm
 2015-03-05 09:20:20 +01:00
PsiOmegaDelta
c08305d113 Merge pull request #8362 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-03-05 08:12:44 +01:00
PsiOmega
173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm
 2015-03-05 08:05:44 +01:00
Zuhayr
b62a6dc76d Merge pull request #8354 from PsiOmegaDelta/Jaunt 
Fixes #8342.
 2015-03-05 12:47:01 +10:30
Zuhayr
5e90eba7d7 Merge pull request #8347 from PsiOmegaDelta/PushItHarderBetterStrongerFaster 
An inhabited AI core can now be pushed.
 2015-03-05 12:44:28 +10:30
Zuhayr
c9a2ed84fe Merge pull request #8352 from PsiOmegaDelta/LessEdits 
Mappings.
 2015-03-05 09:20:03 +10:30
Zuhayr
b4b43a6206 Merge pull request #8350 from PsiOmegaDelta/NanoRuntime 
Fixes NanoUI transfer runtime.
 2015-03-05 09:19:41 +10:30
Zuhayr
44620e2d8d Merge pull request #8351 from PsiOmegaDelta/BlobMove 
Fixes #8348.
 2015-03-05 09:19:25 +10:30
PsiOmegaDelta
de2bd8979f Merge pull request #8356 from Raptor1628/dev-freeze 
Fixes and adjustments
 2015-03-04 20:10:04 +01:00
PsiOmegaDelta
decb9a79eb Merge pull request #8355 from Neerti/2-28-2015_teg_prettyness 
New TEG sprite, NanoUI for TEG, and a runtime fix.
 2015-03-04 20:09:56 +01:00
Raptor1628
cf0e526d91 Fixes and adjustments 
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
 2015-03-04 11:18:40 -05:00
PsiOmega
8feec5760f Fixes #8342. 
Secbots now continually checks if their target remains in sight before bashing the head in.
 2015-03-04 16:54:07 +01:00
Neerti
f229aa479f Adds a bunch of prettiness to the TEG, fixes a runtime. 2015-03-04 09:13:05 -05:00
PsiOmegaDelta
7d3c01c51e Merge pull request #8341 from mwerezak/temperature-fix 
Fixes #7363
 2015-03-04 12:40:54 +01:00
PsiOmegaDelta
6799569d16 Merge pull request #8344 from comma/surgeryfixies 
Surgerything
 2015-03-04 11:00:22 +01:00
Chinsky
198abc02f6 Merge pull request #8345 from PsiOmegaDelta/Triumvirate 
Multiple AIs no longer guaranteed to receive the same ion laws.
 2015-03-04 12:51:31 +03:00
PsiOmega
81b0ab3bcf Mappings. 
Makes specific instances of the engine room air alarm and AI APC.
Includes some map cleanup by Dream Maker itself.
 2015-03-04 10:21:36 +01:00
PsiOmega
fb09009016 Fixes #8348. 
Relocates blob start to adjacent turf, allowing it to act upon (and destroy) the previously weapon blocking emergency shutter.
 2015-03-04 09:53:15 +01:00
PsiOmega
05c487ca8f Fixes NanoUI transfer runtime. 
No longer unconditionally attempts to transfer NanoUIs from one mob to another.
Previously caused runtimes if the source-mob was gibbed or otherwise destroyed.
 2015-03-04 09:46:49 +01:00
mwerezak
f8831fa513 Adjusts human temperature damage intervals 2015-03-03 19:31:01 -05:00
Chinsky
43cc464c28 Merge pull request #8346 from PsiOmegaDelta/Fuel 
Fixes #8343
 2015-03-03 23:55:06 +03:00
Chinsky
2dd304dce6 Merge pull request #8340 from PsiOmegaDelta/NanoDoor 
NanoUI synth door interface.
 2015-03-03 23:41:54 +03:00
PsiOmega
25ca1af5d3 An inhabited AI core can now be pushed. 
No longer can an AI chassis no longer suddenly not be pushed once it's been activated.
 2015-03-03 16:18:52 +01:00
PsiOmega
d6d30054c5 Multiple AIs no longer guaranteed to receive the same ion laws. 
Traitor AIs now also get an ion law, to reduce meta.
Ion storm even now picks a random law for each AI.
Non-crew members are no longer eligible targets for ion laws.
Only recently active crew members are now eligible targets for ion laws.
 2015-03-03 15:40:39 +01:00
PsiOmega
8f929331d8 Fixes #8343 
Fuel no longer attempts to spread itself after having been deleted.
 2015-03-03 15:33:15 +01:00
PsiOmega
99406e3077 NanoUI AI door interface. 
Related:
Cleans up airlock Topic()
Power and electricity is now also handled by process instead of sleeps().
Wires, remote door controls, etc. now use airlock procs instead of manhandling variables directly.
 2015-03-03 13:23:18 +01:00
Chinsky
b0be5a90ff Fixed exploit that allowed you to apply surgery step to any zone regardless of where you state it. For example it allows you to cut off heads, groins and even torsos by starting to cut off limb and then switching to other zone. Also now surgery lock is area-based, so more than one surgeon can work on different organs at same time. 2015-03-03 13:37:26 +03:00
Chinsky
81a9f87ad7 Merge pull request #8336 from mwerezak/liquidfire 
Implements liquid fuel fires
 2015-03-03 10:31:49 +03:00
Chinsky
c837505e8b Merge pull request #8328 from PsiOmegaDelta/LessIsMore 
Cleans up access handling.
 2015-03-03 10:21:16 +03:00
Chinsky
9be2b8d64c Merge pull request #8330 from PsiOmegaDelta/Access 
Increased check_rights flexibility.
 2015-03-03 10:21:11 +03:00
Chinsky
ca0f08c30a Merge pull request #8331 from PsiOmegaDelta/PDATrack 
The AI now have the ability to track senders of PDA messages.
 2015-03-03 10:21:06 +03:00
Chinsky
5f1932a002 Merge pull request #8338 from PsiOmegaDelta/BinaryDeath 
Synth medical sensors now report dead/alive status.
 2015-03-03 10:20:59 +03:00
Snapshot
68d206be6a Merge pull request #8329 from PsiOmegaDelta/Smile 
Fixes #8322.
 2015-03-02 18:36:46 -08:00
Zuhayr
6affacb983 Merge pull request #8337 from PsiOmegaDelta/Map 
Fixes #8334.
 2015-03-03 11:58:35 +10:30
mwerezak
1a4cedd412 Fixes #7363 2015-03-02 13:24:52 -05:00
PsiOmega
318f5e1a92 Cleans up access handling. 2015-03-02 18:55:03 +01:00
mwerezak
49b3db964f Implements fuel fires 
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
 2015-03-02 12:40:01 -05:00
PsiOmega
98be5cbce8 Synth medical sensors now report dead/alive status. 
Synths with medical augmentation sensors enabled will now see the dead/alive status of crew members with suit sensors set to at least binary level.
 2015-03-02 13:04:02 +01:00
PsiOmega
a11c7ba1c7 Fixes #8334. 
Removes references to the load_speed argument in load_map as it doesn't actually exist.
For some reason the dmm_suit injects itself as an argument in airlocks. Putting a band-aid on the symptom.
 2015-03-02 11:42:40 +01:00
Chinsky
bea2d336bb Merge pull request #8313 from MrSnapwalk/peiconupdate 
Updates /obj/item/clothing/under/fluff/parkereliza with better sprites.
 2015-03-02 07:46:57 +03:00
PsiOmegaDelta
2c7f4024ca Merge pull request #8333 from PsiOmegaDelta/dev 
Dev
 2015-03-01 21:22:46 +01:00
PsiOmega
02a1e1d129 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm
 2015-03-01 21:15:47 +01:00
PsiOmegaDelta
1acfce9b29 Merge pull request #8332 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-03-01 21:14:34 +01:00
PsiOmega
cf11fad8bc Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-01 21:13:38 +01:00
PsiOmega
b82df37159 The AI now have the ability to track senders of PDA messages. 
Can only track the original owner of a PDA.
Cannot track the senders/receivers of intercepted messages.
All other tracking conditions apply (camera coverage, no agent ID, etc.).
 2015-03-01 20:55:27 +01:00
Chinsky
a783e7fd52 Merge pull request #8325 from GinjaNinja32/vines 
Properly fixes vines pulling through windoors
 2015-03-01 22:29:21 +03:00
PsiOmega
df689a4f72 Increased check_rights flexibility. 
NanoUI interfaces no longer appear locked when admin observers look at them for too long.
 2015-03-01 15:29:17 +01:00
PsiOmega
bdce7a8e41 Fixes #8322. 
When copying a photo new instances are created of relevant icons, instead of referencing them.
 2015-03-01 15:21:15 +01:00