cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,469 Commits 8 Branches 0 Tags
e9772faabcff4eac867226084d884a777aa3b51d
Commit Graph

18469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mwerezak
e9772faabc Fixes skrell helmet refitting, modkit text 2014-07-20 11:34:46 -04:00
mwerezak
3d9f1754cd Updates eng rig path, adds obj sprites 
Adds object sprite sheets for tajaran, unathi and skrell hardsuits, where the icons were available (just engineering and syndie hardsuits for now).

Makes engineering hardsuits a subtype of the parent rig type, so it is
now possible to update eng hardsuits without affecting every other
hardsuit type.
 2014-07-19 23:18:32 -04:00
mwerezak
789d3e4d54 Fixes modkits 
Fixes modkits not tracking suit/helmet parts, not checking allowed
parts, and not checking if the clothing needs to be modified.
 2014-07-19 23:17:35 -04:00
mwerezak
e8c4ad07bb Adds a system for refitting species clothing 2014-07-19 22:08:31 -04:00
Zuhayr
73d3883da3 Merge pull request #5652 from comma/master 
Couple xenoarch fixes
 2014-07-17 23:56:18 +09:30
Chinsky
248affdebe Merge pull request #5656 from mwerezak/wound-infections 
Infection system tweaks
 2014-07-17 15:39:16 +04:00
Chinsky
e2e944dc66 Merge pull request #5655 from Walter0o/patch-2 
should fix #5618, trivial kitchen utensil bug
 2014-07-17 15:38:42 +04:00
Chinsky
a4af0a4eea Merge pull request #3 from Walter0o/patch-1 
missing power check
 2014-07-17 15:36:15 +04:00
Zuhayr
951e905beb Merge pull request #5658 from atlantiscze/cable_fix 
Cable coil bugfix
 2014-07-17 09:42:08 +09:30
Atlantiscze
386b1e6ce4 Bugfix - cable coil now shows correct transferred amount. 2014-07-16 22:59:14 +02:00
mwerezak
1eee72d118 Updates body scanner readout for internal organs 2014-07-16 15:59:18 -04:00
mwerezak
13b757938d Infections raise temperature faster wrt germ_level 2014-07-16 15:52:42 -04:00
mwerezak
d6a070e6fc Improved full body scanner infection readout 
Now provides a higher level of precision on infection severity.
 2014-07-16 15:44:16 -04:00
Walter0o
6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
Mloc
3d7fac2555 Merge pull request #5628 from Zuhayr/master 
Made Vox-Pidgin and Rootspeak untranslatable even by pAIs.
 2014-07-16 14:39:38 +01:00
Walter0o
8baf6e4661 another missing battery check 2014-07-16 15:20:23 +02:00
Walter0o
9d3a87115a missing power check 
people could still use this without any charge
 2014-07-16 15:13:13 +02:00
Chinsky
4c4c248a72 Merge pull request #5623 from Decius-R/aeneas_labcoat_edit 
Changes labcoat sprite to be closed on custom item...
 2014-07-16 16:23:43 +04:00
Chinsky
61f8713941 Possible fix for #5645 
I think issue is that harvester won't forget what artifact it is using until harvesting process is started.
 2014-07-16 16:22:26 +04:00
Chinsky
5018330a5a Fixes #5650 
Fixes #5649
Removed that mundane objects check as I couldn't think of why would that even be a thing.
 2014-07-16 14:37:12 +04:00
Chinsky
d1687dc50e Fixes #5648 
Now scanner will just give warning if clicked too fast, instead of giving obsolete data.
Also moved code from New() to initalize(), since it depends on all things already being there and a master controller existing.
 2014-07-16 13:39:56 +04:00
Chinsky
561eb99561 Fixes #5647 Fixes #5646 2014-07-16 13:26:13 +04:00
Chinsky
bd080c237f Merge pull request #5641 from JimTheCactus/limb_sparks_fix 
Fixes #5640 Make sparks effect target mob, not organ
 2014-07-16 13:03:14 +04:00
Chinsky
d04433aa87 Merge pull request #5626 from mwerezak/damage-fixes 
A few damage and defence related fixes
 2014-07-16 12:19:29 +04:00
Chinsky
a7379f925a Merge pull request #5634 from Whitellama/master 
Made LOOC show character names of living players, fixing #5633
 2014-07-16 12:18:49 +04:00
Chinsky
857cbe23bf Merge pull request #5635 from mwerezak/air-alarm-fix 
Fixes air alarms not updating icons, fixes siphoning or cycling being stopped even though environmental mode is set
 2014-07-16 12:17:52 +04:00
Zuhayr
9fe00c09a6 Merge pull request #5625 from JimTheCactus/med_records_fix 
Corrects Issue With Record Entries Containing All Whitespace (#5538)
 2014-07-16 15:32:29 +09:30
JimTheCactus
ff382bb231 Fixes #5640 Make sparks effect target mob, not organ 
The malfunction sparks were calling to a var src, which in most other places is the main object itself, here that's the organ and it doesn't have a loc. Changed it to call the organ's owner.
 2014-07-15 20:34:08 -06:00
mwerezak
a4bef09a69 Fixes air alarm icons not updating 
I'm not sure how I missed that the first time.
 2014-07-15 18:27:15 -04:00
mwerezak
c469b188ee Fixes air alarms not siphoning or cycling 2014-07-15 16:35:03 -04:00
Whitellama
8ec8c615e4 Made it so admins see global LOOC character names/BYOND keys based on whether that player is alive/dead 2014-07-15 13:33:52 -07:00
Whitellama
866a486ad6 Made LOOC show character names of living players and BYOND keys of observing/dead players 2014-07-15 12:55:21 -07:00
Chinsky
6184006a23 Merge pull request #5621 from Decius-R/mailman_fix 
Fixes mailman sprite...
 2014-07-15 13:01:09 +04:00
Zuhayr
ccb95c996c Made Vox-Pidgin and Rootspeak untranslatable even by pAIs. 2014-07-15 15:57:28 +09:30
Ccomp5950
67bf27e6f4 Merge pull request #5602 from Hubblenaut/food 
Grid Placement for Food
 2014-07-15 01:22:47 -05:00
mwerezak
fd6181c54f Fixes melee attacks using area effect armour values 
def_zone is normally not set when attacking with a melee weapon, and the
melee armour check didn't use target_zone for some reason.
 2014-07-15 01:37:29 -04:00
mwerezak
4448784402 Fixes suits being punctured by projectiles when... 
...fully blocked by a shield.
 2014-07-15 01:37:08 -04:00
mwerezak
f49e709394 Fixes organs not being removed due to damage 
Because the dismemberment check was being done before brute_dam was
updated, the attack that actually brought brute_dam above the threshold
would not be able to pass the check, regardless of how much damage was
actually done.
 2014-07-15 01:36:48 -04:00
JimTheCactus
b905b08489 Restored original .int file. It's not being ignored right I think. 2014-07-14 21:02:13 -06:00
JimTheCactus
41904850d4 Fixed not-quite-blank field issues in the various record keeping computers. 
Added trim to most fields in Medical Computer
Added trim to most fields in Staff Computer
Added name verification in Staff Computer
Added trim to most fields in Security Computer
Added name verification in Security Computer
 2014-07-14 20:55:39 -06:00
Decius
3a92fe188c Changes labcoat sprite to be closed on custom item... 
Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-14 21:11:46 -04:00
Decius
1b7ab133f3 Fixes mailman sprite... 
West facing sprite was one pixel too far to the left.

Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-14 19:30:27 -04:00
Hubblenaut
c920b0234f Renames CoM into center_of_mass 2014-07-14 23:13:46 +02:00
Zuhayr
caee6afed8 Merge pull request #5615 from Whitellama/master 
Fixed a few issues with cans
 2014-07-14 20:06:01 +09:30
Whitellama
60bc22e829 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-07-13 23:24:32 -07:00
Whitellama
a6b4f5d2aa Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans 2014-07-13 23:23:26 -07:00
Zuhayr
16c1494d7f Merge pull request #5613 from comma/master 
Fixes #5563
 2014-07-14 15:49:19 +09:30
Chinsky
bb6eedf193 Fixes #5563 2014-07-14 08:28:14 +04:00
Ccomp5950
2ec293f67e Merge pull request #5587 from SparklySheep/patch-4 
Detective Revolver nerf. Uses agony instead of...
 2014-07-13 23:16:18 -05:00
Chinsky
d59e5b8da2 Merge pull request #5603 from DJSnapshot/hotfix 
Changing URL of Corporate Regulations to the new Corporate Regulations
 2014-07-14 07:12:37 +04:00