cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 13:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,904 Commits 74 Branches 23 Tags
31b2ce9cf7e77d4749b60310e8a1680098e9dc95
Commit Graph

24904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PsiOmegaDelta
837af60946 Merge pull request #9478 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-05-26 08:33:34 +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
Zuhayr
e5376460fc Merge pull request #9467 from PsiOmegaDelta/Cleanup 
AddToChangelog removal.
 2015-05-26 15:10:52 +09:30
Chinsky
354def85e1 Merge pull request #9468 from StarSmasher44/patch-2 
Fixes #9294
 2015-05-26 07:40:05 +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
PsiOmega
c46578c810 AddToChangelog removal. 
Removes the source for the old changelog tool.
 2015-05-25 20:35:08 +02:00
PsiOmega
4956af8597 Fixes #9461. 
Corrects the path of the uplink item.
 2015-05-25 17:59:41 +02:00
Zuhayr
ef46ebfe2c Merge pull request #9455 from mwerezak/traps 
Updates bear traps
 2015-05-25 14:44:02 +09:30
mwerezak
02dafb3c71 Adds a bunch of traps to the skipjack equipment 2015-05-24 16:44:35 -04: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
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
Zuhayr
2ca7e253e2 Merge pull request #9445 from PsiOmegaDelta/150523-WaterFlower 
Fixes #9443.
 2015-05-24 21:52:26 +09:30
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
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
048771ed94 Merge pull request #9438 from Zuhayr/dev-freeze 
Dev freeze
 2015-05-23 21:30:01 +09:30
Zuhayr
50dd6aa0bb Merge with master. 2015-05-23 21:29:40 +09:30
Zuhayr
98cbdfcc62 Merge pull request #9421 from PsiOmegaDelta/MissingMaterials-150522 
Map fixes.
 2015-05-23 20:53:57 +09:30
Zuhayr
b9a4328e4c Merge pull request #9425 from PsiOmegaDelta/NanoUIMap-150522 
Updates the NanoUI map.
 2015-05-23 20:42:20 +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
PsiOmega
a294ce9128 Adds additional missing materials: 
EVA again has:
3x50 sheets of steel.
1x10 sheets of plasteel
1x50 sheets of glass
1x50 sheets of reinforced glass.

Robotics again has:
5x50 sheets of metal.
1x20 sheets of glass.
1x10 sheets of plasteel.

Cargo again has:
1x50 sheets of metal.
1x50 sheets of glass.
 2015-05-23 12:49:58 +02:00
PsiOmega
2b64f0343a Updates the NanoUI map. 2015-05-22 17:42:55 +02:00
Chinsky
c580d56c65 Merge pull request #9413 from DeeUnderscore/fix-intercom 
Fix Say ":i " not working
 2015-05-22 14:35:56 +03:00
PsiOmega
3837e67f70 Fixes #9054. 
Seeing how xenobiology is separated from the rest of the station, the Research disposal unit now leaves its goods in the main research hallway.
 2015-05-22 11:40:57 +02:00
PsiOmega
38fbe15f5a Fixes #9265. 
Now either engineering or atmos techs can utilize the windoors.
 2015-05-22 09:47:52 +02:00
PsiOmega
3d12ad3ab0 Fixes #9359. 
While I'm at it.
 2015-05-22 09:44:27 +02:00
PsiOmega
e9abad5c70 Restores missing materiel in engineering. 
The engineering workshop now again contains:
3 sheets of steel, 50 units ea.
3 sheets of glass, 50 units ea.
3 sheets of plasteel, 10 units ea.
1 sheet of plastic, 20 units.
 2015-05-22 09:41:07 +02:00
PsiOmegaDelta
7c451f4e02 Merge pull request #9419 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-05-22 08:38:20 +02:00
PsiOmega
51231538ed Changelog update. 2015-05-22 08:27:42 +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
cf591c290b Adds limit to prevent random walking below the lower limit temperature, too. 2015-05-22 02:21:12 -04:00
mwerezak
4d54742079 Fixes portable generators going about their temperature limit 2015-05-22 01:27:01 -04:00
PsiOmegaDelta
a677ec3b83 Merge pull request #9412 from Kelenius/ofChemAndReadme 
Updates Chemistry-Readme.dm
 2015-05-22 06:37:25 +02:00
Chinsky
b5245f0a5d Merge pull request #9415 from PsiOmegaDelta/DropFix 
Items again have their loc set just before dropped() is called.
 2015-05-22 03:42:29 +03: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
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
Kelenius
360113850a Updates Chemistry-Readme.dm 
Also removes one unused variable that I forgot to remove.
 2015-05-21 12:43:28 +03:00
Chinsky
ae3e80b85b Merge pull request #9409 from GinjaNinja32/supply 
Fixes supply shuttle
 2015-05-21 12:30:20 +03:00
Zuhayr
3377f8bbf1 Merge pull request #9407 from GinjaNinja32/floorpainter 
Fixes floor painter 'side/3 corners'->'black' and another state
 2015-05-21 18:43:00 +09:30