cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,764 Commits 61 Branches 14 Tags
643de0c922473f9ee721be207a024676121294de
Commit Graph

200 Commits

Author SHA1 Message Date
Cheridan
096324b93b Merge pull request #7897 from paprka/riiiip 
Packages play a ripping noise when you open them
 2015-02-24 21:47:52 -06:00
paprka
3572e2c2c5 packages play a ripping noise when you open them 2015-02-22 01:11:03 -08:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
Menshin
b8230e024b * Cleaned the disposals code a bit (making it uses the defines !) 
* Disposals constructs are now stored inside disposals instead of having them deleted and a copy created
* Bins, chutes and outlets will now properly clean any connected trunk on qdel()
* You can no longer change the RPD setting by keeping its window opened
* You can no longer use the RPD as a non-dextrous mob
* Reinforced floors will now be broken by ejected items/mobs, instead of stucking them in the void indefinitely
 2015-01-19 01:53:19 +01:00
Menshin
8d1ebf3ad1 * Prevent stacking of dense disposal constructs (bin, outlet, chute) 
* Some general code cleaning (less snowflaking)
 2015-01-15 20:05:15 +01:00
tkdrg
cdb5066502 Merge pull request #6324 from Razharas/GenShit 
Added datum mutations
 2014-12-31 17:24:15 -03:00
AnturK
aa79311dff Fixes janiborg trashbag emptying 2014-12-29 14:21:08 +01:00
Razharas
8d110ee496 Tiny clean up, still lots of work to do 
Only compiletested, these changes were never tested in the game yet
 2014-12-12 23:57:11 +03:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat 
Standardizing attack messages to always show the attacker first
 2014-12-04 12:45:31 -06:00
phil235
86405fa8c0 Standardizes attack messages to always show the attacker first (when there is an attacker). 
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
 2014-11-24 01:49:34 +01:00
Razharas
3511e0dada Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 
Conflicts:
	code/game/turfs/simulated/walls.dm

Ye somth liek dat
 2014-11-23 17:46:14 +03:00
Razharas
ff456ebaf4 Unwinded most of shit 
Meh
 2014-11-19 21:36:45 +03:00
Razharas
b071a0167e Made explosions work in a slightly different way 
Yep
 2014-11-18 16:22:41 +03:00
Hornygranny
2374eb9720 fixes disposals flushing their stored construct 
fixes an atmos runtime
fixes a disposal pipe runtime
 2014-11-17 11:30:33 -08:00
Swag McYolosteinen
8adfff35af Merge pull request #5732 from phil235/DisposalConstructionRuntimeFix 
Fix Disposal pipe construction runtime.
 2014-11-08 09:31:52 +01:00
Remie Richards
0914b1a7cd Merge pull request #5642 from phil235/AttackAnimation 
Adding an attack animation to most attacks
 2014-11-07 18:39:27 +00:00
phil235
aa9873d7ff Fix Disposal pipe construction runtime. 2014-11-07 17:12:16 +01:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
Aranclanos
0e2176c7a0 Added a new proc for movable atoms, disposalEnterTry(). It will be used by disposal chutes to check if the object who bumped them can enter or not. 
As for the moment, mechas and projectiles will fail.
 2014-11-04 17:23:02 -03:00
phil235
74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation 
Conflicts:
	code/modules/mob/living/living.dm
 2014-11-04 18:55:07 +01:00
Cheridan
df13b0d840 Merge pull request #5591 from hornygranny/OOPgularity3 
improved deconstruction, singularity stuff
 2014-11-03 20:20:55 -06:00
hornygranny
bf9679d6cb Merge pull request #5581 from tkdrg/spacefactory13 
Constructable conveyor belts!
 2014-11-03 17:33:32 -08:00
hornygranny
b32e9cff12 Merge pull request #5621 from tkdrg/damnoldcoders 
Moves around some vars
 2014-11-03 17:15:54 -08:00
tkdrg
d3727e6e3e Removes unused code instead of commenting it out 2014-11-03 18:25:05 -03:00
phil235
3f30912c51 WIP - Adding attack animation to most attacks. 
Fixing a couple "for(......) show_message()".
 2014-11-02 22:50:58 +01:00
Cheridan
51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix 
Adding checks for stun, restrained to many object verbs.
 2014-11-02 11:34:48 -06:00
tkdrg
a97c4de972 Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj) 
Removes force from pipes
Removes unused turf var icon_old
Moves pass_flags to /atom/movable
 2014-11-02 14:10:03 -03:00
tkdrg
2e35e22939 Removes obsolete attack_hand() from oneway conveyor belt switch 2014-11-01 18:36:06 -03:00
tkdrg
2d264d828f Constructable conveyors: Corner belts, fingerprint fixes 2014-11-01 15:50:49 -03:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00
tkdrg
f776f4a30b Merge remote-tracking branch 'phil235/ConveyorSwitchPrintsFix' into spacefactory13 
Conflicts:
	code/modules/recycling/conveyor2.dm
 2014-11-01 13:48:16 -03:00
phil235
a559b64e77 Fixes conveyor switches not having fingerprints. Simplifying the conveyor switch code a bit. 2014-11-01 14:02:06 +01:00
Hornygranny
955847de74 defines 2014-10-31 19:00:50 -07:00
Hornygranny
5815d7e011 grilles are now damaged by thrown items 
disposalpipes deconstruction
atmos pipes deconstruction
 2014-10-31 18:26:42 -07:00
tkdrg
a5aa93a280 Constructable conveyor belts can now be ordered from cargo. 2014-10-31 18:28:25 -03:00
William Wallace
5fbb445168 Throwing items in to disposal bins updates the icon 
This fixes #5504
 2014-10-31 20:04:05 +00:00
tkdrg
9526b8804b Merge remote-tracking branch 'upstream/master' into attackoftheturfs 2014-10-30 19:35:03 -03:00
phil235
8b6a8f179d little fix 2014-10-23 19:51:12 +02:00
phil235
b971a09bcd Wrapping something with package wrapper now gives a message. 
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
 2014-10-23 19:30:09 +02:00
hornygranny
e556867a58 Merge pull request #5277 from paprka/newshotguns 
Adds improvised shotguns and fixes paths for wrap paper
 2014-10-21 09:51:35 -07:00
tkdrg
cd5720b6a7 Floor refactor, try #1 2014-10-19 16:48:35 -03:00
paprka
d244fd6bbd initial commit 2014-10-15 13:29:19 -07:00
phil235
a10b84e57c derp 2014-10-15 18:32:55 +02:00
phil235
45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix 
Conflicts:
	code/modules/recycling/disposal.dm
 2014-10-15 18:23:40 +02:00
phil235
dbea503e88 Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere. 
Fixing one instance of "for(mob in viewers) show_message()" to "visible_message()"
 2014-10-15 18:03:06 +02:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc. 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
 2014-10-05 01:29:30 +02:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
phil235
1840d72ae4 reverting to show_message proc in three places. 2014-09-25 19:14:51 +02:00