cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-31 20:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,963 Commits 74 Branches 23 Tags
3cf0018fb8ff212e1e98e40d590d3f84185942a9
Commit Graph

18795 Commits

Author SHA1 Message Date
Zuhayr
3cf0018fb8 Fixing up bed icons etc. 2015-05-30 01:13:11 +09:30
Zuhayr
93aaa48cd8 Fixes #9571, various other tweaks. 2015-05-30 00:59:39 +09:30
Zuhayr
7d7723c19d Further material tweaks. 2015-05-30 00:45:58 +09:30
Zuhayr
e9f2f5cf55 Converted comfy chairs to material system, cleaned up colours/icons. 2015-05-30 00:45:36 +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
GinjaNinja32
42623947e1 Merge pull request #9539 from atlantiscze/get-apc-refactor 
Refactors get_apc()
 2015-05-28 19:11:36 +01:00
Atlantis
ccf9afb9cb Implements PsiOmegaDelta's suggestion (fixed edition) 2015-05-28 17:24:41 +02:00
Atlantis
a4c29238aa Refactors get_apc() 
- Fixes #9536
- Area now has APC variable, instead of list. APC construction, etc. should have checks to allow one APC per area only, so situations with multi-APC areas are unlikely, unless adminbus occurs. Either way, with or without this commit, one of the APCs would be unoperational (no load)
- get_apc() no longer uses very laggy locate() in contents of area. In situations where get_apc() is called repeately this brings massive increase in performance (from 0.120 to 0.000, depending on area size and amount of things in contents of that area) as it now only returns the apc variable.
 2015-05-28 17:11:26 +02:00
Kelenius
f2c0cb483d Fixes skrell and dionaea alcohol resistance/weakness 2015-05-28 08:49:58 +03:00
PsiOmegaDelta
928722c08a Merge pull request #9526 from Raptor1628/dev-freeze 
Rig Icon Fixes
 2015-05-28 07:06:02 +02:00
Raptor1628
62ef32a725 Rig Icon Fixes 
Fixes some incorrect names that were resulting in broken icons.
 2015-05-27 23:32:27 -04:00
Yoshax
850301ed0f Fixes bluespace relay issues (being un deconstructable, and not building properly. 2015-05-28 03:56:53 +01:00
PsiOmegaDelta
414a4321fd Merge pull request #9496 from mwerezak/ivstand 
IV stands are no longer bullet shields
 2015-05-27 19:57:40 +02:00
PsiOmegaDelta
9ccb2d4f61 Merge pull request #9499 from mwerezak/robolimbs 
Robolimb fixes
 2015-05-27 19:57:08 +02:00
Zuhayr
00ede5d475 Merge pull request #9477 from comma/dev-freeze 
Moved Captain's announcment out of equipping to spawning.
 2015-05-28 03:09:25 +09:30
mwerezak
b4adb1a432 Updates species checks 2015-05-27 01:34:50 -04:00
mwerezak
7dcc98e1a4 Fixes robotic organs causing pain messages 
Also fixes pain() not checking if the species has NO_PAIN.
 2015-05-27 01:15:55 -04:00
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
Zuhayr
c62514887b Merge pull request #9481 from PsiOmegaDelta/150526-Inactivity 
Inactivity process tweaks.
 2015-05-27 13:24:22 +09:30
Chinsky
3d5b7e5744 Merge pull request #9464 from Kelenius/ofChemAndAnalyze 
Medical scanners now scan ingested reagents
 2015-05-27 06:32:20 +03:00
mwerezak
31b2ce9cf7 IV stand span classes 2015-05-26 23:07:21 -04:00
mwerezak
e510f6625f Fixes IV stands blocking bullets 
IV stands now check PASSTABLE, allowing projectiles and small mobs to
pass through them.

Flipped tables now block small mobs.
 2015-05-26 23:05:38 -04:00
PsiOmega
98c585615e Inactivity process tweaks. 
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
 2015-05-26 09:04:26 +02:00
PsiOmega
5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/toys.dm
 2015-05-26 08:26:48 +02:00
Ccomp5950
fff9e5ec92 Merge pull request #9463 from PsiOmegaDelta/SinfulLiving 
Fixes #9461.
 2015-05-26 02:11:31 -04:00
Chinsky
f1c194d5e9 Moved Captain's announcment out of equipping to spawning. Removed redundant satchel spawning things - they are being taken care of in job's equip() 2015-05-26 09:11:04 +03:00
StarSmasher
711ad88903 Fixes #9294 
Adding 6 tomato juice to 50 protein doesn't really work if the maximum is 50.
Also fixed it in the vegetable pizzas.

Figured a quickfix would be better than a very delayed fix.
 2015-05-25 22:26:55 +02:00
Kelenius
359e055463 Lets medical scanners scan stomach 2015-05-25 19:11:14 +03:00
PsiOmega
4956af8597 Fixes #9461. 
Corrects the path of the uplink item.
 2015-05-25 17:59:41 +02:00
mwerezak
c08774d96e Updates bear traps 
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.

Conflicts:
	baystation12.dme
 2015-05-24 16:33:41 -04:00
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
Chinsky
b01c3a4ba9 Merge pull request #9451 from PsiOmegaDelta/Tmp 
Fixes #9447.
 2015-05-24 18:16:08 +03:00
Chinsky
7835afc361 Merge pull request #9450 from mwerezak/workboots 
Adds engineering workboots
 2015-05-24 18:16:00 +03:00
PsiOmegaDelta
3d9aa48f49 Merge pull request #9442 from GinjaNinja32/shuttle 
Supply shuttle and crate fixes
 2015-05-24 14:43:15 +02:00
PsiOmegaDelta
2fc50e7d03 Merge pull request #9449 from mwerezak/airlock-sound 
Airlock sounds
 2015-05-24 14:43:09 +02:00
PsiOmega
c21a456379 Fixes #9447. 
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
 2015-05-24 11:33:54 +02:00
mwerezak
b4c88c6186 Adds engineering workboots 
Sprites credit ChessPiece.
 2015-05-23 23:00:26 -04:00
mwerezak
e6be73ac56 Airlock sounds 2015-05-23 22:59:18 -04: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
da22851ff7 Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge 2015-05-24 01:16:09 +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
Atlantiscze
5aa37bd859 Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge 2015-05-23 21:22:23 +02:00
Atlantiscze
06ec54c7b8 Modified behavior of machine overload to further prevent spam and to make it more useful if targeted on high-power machinery such as SMES. 
- This is a WIP thing. Commiting so i can finish it on my second computer.
 2015-05-23 21:19:32 +02:00
PsiOmega
5ee1e3df56 Fixes #9443. 
Restores an old sunflower sprite for use by toys.
 2015-05-23 19:38:31 +02:00
GinjaNinja32
3fb3a18f05 Supply shuttle and crate fixes 
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
 2015-05-23 16:15:04 +01:00
Zuhayr
50dd6aa0bb Merge with master. 2015-05-23 21:29:40 +09:30
Zuhayr
a2571b95c3 Merge pull request #9418 from mwerezak/port-gen 
Fixes portable generators going above their temperature limit
 2015-05-23 20:40:07 +09:30
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00