cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 06:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,842 Commits 74 Branches 23 Tags
1bbb68e9d2c18ae05fe06f33e4e8f90ea193bbd0
Commit Graph

3327 Commits

Author SHA1 Message Date
Mike
1bbb68e9d2 Backpacks now play sound when un/equipped 
They did this before, but that was due to all storage items playing
sound. Now only applies to backpacks.
 2014-04-24 21:18:46 -07:00
Mike
e84747510c Cleaned up reference to outdated proc 
Removed references to outdated get_equipped_items(). Still one left.
Removed unnecessary override for belts.
 2014-04-24 21:01:01 -07:00
Mike
886b3b1cae Storage sound is now controlled by var 
Realized the previously removed MouseDrop override for pill bottles was
to stop the rustle sound from playing.
 2014-04-24 20:28:50 -07:00
mwerezak
b2234cb774 Rustle sound now plays any time a storage is opened 2014-04-24 12:53:07 -04:00
mwerezak
82499cf50c Updated subtypes of storage to use the new open() proc 
Also got rid of /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj). Not sure what it was doing differently.
 2014-04-24 12:51:23 -04:00
mwerezak
8109c33749 Removed hold.loc = usr hack from webbings code. 
Got rid of the stupid hold.loc = usr hack. Now not necessary, as storage is refactored so that there is now an explicit proc for when a mob opens up a storage to view the contents. Removed the inaccessible if statement in /obj/item/weapon/storage/MouseDrop() (bad automerge?)
 2014-04-24 12:24:00 -04:00
Ccomp5950
223aa25695 Merge pull request #4788 from RavingManiac/dev 
Breakable shuttle windows. Rearranged fitness.
 2014-04-21 22:00:01 -05:00
RavingManiac
4fd01c2384 Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1. 
Fitness room rearranged to make more sense, with glass around pool.
 2014-04-20 22:35:59 +08:00
RKF45
1cfd0c3342 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moreposters 
Conflicts:
	code/game/objects/effects/decals/posters/bs12.dm
	icons/obj/contraband.dmi
 2014-04-19 19:24:45 +02:00
Chinsky
8777c8c071 Merge pull request #4765 from Jarcolr/devupdate 
New posters and sprites
 2014-04-19 21:10:51 +04:00
Chinsky
5fffe122dc Merge pull request #4776 from mwerezak/tac-armoury-beanbags 
Added beanbag shotguns to the tactical armoury
 2014-04-19 14:23:55 +04:00
Mike
2d7dca8eb5 Added beanbag shotguns to the tactical armoury 2014-04-18 20:28:53 -04:00
RKF45
2c839d4c09 Second and final batch 2014-04-18 21:28:27 +02:00
RKF45
56689c887d First load of posters 2014-04-18 20:31:27 +02:00
Mike
e76f431687 Adjusted fuel spread 
Made fuel stickier, so it spreads less thinly.
 2014-04-17 21:19:05 -04:00
Jarcolr
4bb17b8686 Let there be space 
woo
 2014-04-17 23:53:27 +03:00
Jarcolr
1e9e50b467 Space and space 
Woop.
 2014-04-17 15:39:44 +03:00
Jarcolr
b33b71649d New posters - Nienhaus 
These are new posters for more postery goodness. Credits for the sprites
go to Nienhaus.
For the sprites of the poster go to http://puu.sh/5QlUx.dmi
2 posters are not included: 6th and 7th due to reasons.
 2014-04-17 15:24:11 +03:00
Ravensdale
45d82c2e00 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/modules/mob/living/say.dm
	maps/tgstation2.dmm
 2014-04-16 22:13:48 -07:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Chinsky
336a1c09ab Merge pull request #4753 from mwerezak/magboots-action-icon 
Magboots action icon
 2014-04-14 16:11:52 +04:00
Mike
b24b39d267 Clean up check for item being equipped 
Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
 2014-04-13 13:36:48 -04:00
PsiOmega
34b0564d26 Adds a necessary check to ensure that pipes on top of plating can be painted. 2014-04-13 11:43:17 +02:00
PsiOmega
93012b3fca Ensures that one can only paint pipes within range and that there is no blocking floor tile. 2014-04-13 11:31:04 +02:00
Jarcolr
522bebb197 Fixes #4721 
Also added the multitool to bomb supply storage.
 2014-04-12 13:06:10 +03:00
DJSnapshot
756d7a83e9 Merge pull request #4715 from Iamgoofball/FUCKMONKEY 
Removes the last traces of Monkey Emergency
 2014-04-11 11:47:37 -07:00
DJSnapshot
da3489196c Merge pull request #4727 from Ccomp5950/FUCK-say-code 
Saycode rewrite.
 2014-04-10 22:42:38 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Ravensdale
0d589ff569 Changes all instances of PLASMA in active code into PHORON 2014-04-10 00:19:29 -07:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction 
Fixes some typos and descriptions
 2014-04-09 21:48:19 +04:00
Jarcolr
868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
RavingManiac
ac9d37261f Check restricted to closets and storage items due to lag concerns. 2014-04-07 20:45:05 +08:00
RavingManiac
795df2b2c9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-04-07 20:18:20 +08:00
Ccomp5950
82d4d3a497 Merge pull request #4712 from Jarcolr/kilo 
Fix for #4701 and immersion
 2014-04-07 02:20:55 -05:00
iamgoofball
238451dbc9 die monkey emergency DIE 2014-04-06 12:05:41 -07:00
Chinsky
4ee7569858 Merge pull request #4694 from mwerezak/master 
Fixes #4689, #4680
 2014-04-06 22:12:08 +04:00
Chinsky
5300508fc2 Merge pull request #4702 from Jarcolr/patch-2 
Kicking a grille does 2 less damage; fix for #4557
 2014-04-06 22:11:43 +04:00
Jarcolr
b83e0f2ad7 Adds additional text to lighting 2014-04-06 13:24:44 +03:00
Jarcolr
b6ee8a62b0 Fix for 4601 and immersion 
Premium Cigar now understands being lit,and the corn cob pipe/ cigars
now no longer refuse being hit by fire.
 2014-04-06 12:43:58 +03:00
RavingManiac
f0bda5a494 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-04-06 14:28:28 +08:00
RavingManiac
e348f532ab Items inside objects will now hear what the object is hearing, as will items inside those items. This allows tape recorders to work in containers and closets. 2014-04-06 14:20:57 +08:00
Jarcolr
a3bf9733a2 Kicking a grille does 2 less damage; fix for #4557 
It will now take 10 hits to destroy it without using a weapon or tools.

Take that,metagamers!
 2014-04-05 19:15:41 +03:00
Mloc
cd23a4b786 Merge pull request #4690 from Glloyd/ear_stuff_2 
A first pass at more realistic w_class values
 2014-04-05 16:23:59 +01:00
Mike
920a08412b Fixes #4689 
Rods can't break reinforced windows.
 2014-04-05 00:38:48 -04:00
Ccomp5950
6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2014-04-04 01:14:31 -05:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Ccomp5950
13532e1ddd Merge pull request #4655 from RavingManiac/dev 
Inflatable walls and airlocks
 2014-04-03 13:31:39 -05:00
Graham Lloyd
b0fc611aca Lets people put penlights into their ears. 2014-04-01 16:36:58 -04:00