cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 09:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,598 Commits 61 Branches 14 Tags
f643769ef460fc0111d97501ac613009f5cc2d4d
Commit Graph

1305 Commits

Author SHA1 Message Date
Incoming
fd17e5fd57 Fixes a critical bug where clicking on a closed closet that can't be opened (welded most likely) would lead to an infinite loop of attacking attackby and attack_hand until the mob pulled away from the closet. Eating too many of these errors causes the server to cry for mercy and shut down. Meaning of course that EVERY PLAYER IN THE GAME WHO READS THIS PULL CAN NOW CRASH THE GAME AT THIER LEISURE. 
So yeah merge quick please.
 2015-05-20 23:00:28 -04:00
kingofkosmos
494403969e Alt-click-toggles now do proper checks 
Such as if you're near the thing, conscious, alive etc.

Fixes #9238
 2015-05-18 20:22:04 +03:00
Aranclanos
965ebdaed8 Fixes range targets changing icons 
Fixes issue #129
Removed the unused /datum/bullethole
Removed some copypaste code inbetween the targets and the target stakes
Made these objects not search for eachother in the nearby turfs, they both link to eachother now
Added removeOverlays() and nullPinnedLoc() procs for /obj/item/target
Added removeTarget() and nullPinnedTarget() procs for /obj/structure/target_stake
Added a huge list of additions to the commit log that nobody will read
Cleaned up the code for both objects (target and target stakes)
 2015-05-14 03:30:32 -03:00
Cheridan
ba20b8a265 Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine 
Resolves #1358, /code/defines/obj.dm reorganization
 2015-05-13 09:23:56 -05:00
Jordie0608
ec9382c43b Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem 
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
 2015-05-13 20:01:27 +10:00
Cheridan
f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
Jordie
bd12598404 Merge pull request #9376 from spasticVerbalizer/stackingFalseWalls 
Adds check to prevent false wall stacking, fixes #6449
 2015-05-11 00:07:11 +10:00
spasticVerbalizer
040fd7d8b7 Change uses of 'usr' to 'user', move checking of wall up so the message actually shows 2015-05-10 13:31:10 +02:00
Jordie0608
f36d6bec08 fixes false rwalls not smooting, actually fixes barnyard improving 2015-05-10 21:17:46 +10:00
Jordie0608
502d21a4da Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine 
Conflicts:
	tgstation.dme
 2015-05-10 14:48:35 +10:00
spasticVerbalizer
087365e763 src.contents to src.loc.contents 2015-05-09 20:49:44 +02:00
spasticVerbalizer
faf6bff92c Typecheck for turf being a wall, look in contents rather than loc. 2015-05-09 18:58:30 +02:00
GunHog
7c9667db38 Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me 2015-05-09 11:40:44 -05:00
Jordie0608
7369992d3d further reorganization, elimination of old defines folder 2015-05-09 23:16:57 +10:00
Jordie
4e82cd9689 Merge pull request #9355 from Firecage/OverlaycleanBGone 
Removes the ability to clean Overlays
 2015-05-09 21:30:21 +10:00
Jordie
279a2653c6 Merge pull request #9347 from SamuelRowe/master 
Spelling and grammar fixes *FIXED*
 2015-05-09 20:31:54 +10:00
GunHog
26df5b6c8e Removes mining drill power mechanic. 
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
 2015-05-08 10:12:22 -05:00
phil235
489d076de5 Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot 
Fixes #9035, atmos locker sprite and misc logging bug
 2015-05-08 16:24:21 +02:00
Jordie
c9b804f6f6 Merge pull request #9256 from astralenigma/cradesbypaprka 
Crates are mailed with manifests taped to the outside by paprka Merge Conflict resolution
 2015-05-08 22:10:35 +10:00
Nienhaus
5812e63b4a Merge pull request #9313 from xxalpha/barsign 
"The Net" barsign
 2015-05-06 16:18:31 -05:00
Cheridan
95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton 
Batons for Light ERP
 2015-05-06 09:03:55 -05:00
spasticVerbalizer
22fd9cc430 Added check to prevent false wall stacking 2015-05-06 15:35:17 +02:00
Samuel Rowe
b8ce5bc7cf E 2015-05-06 15:31:09 +12:00
Cheridan
f11122c255 Merge pull request #9338 from optimumtact/framingrage 
Change machine frames and girders deconstruction step
 2015-05-05 21:38:02 -05:00
Firecage
c0c2c8b097 cleanable #define 2015-05-05 18:51:44 +02:00
Firecage
522e77752f Removes the ability to clean Overlays 2015-05-05 17:36:51 +02:00
Jordie0608
e810855367 reorganizing stray objs in /defines 2015-05-05 21:18:21 +10:00
oranges
4ac3497ebe Change machine frames and girders deconstruction step 
They now use the screwdriver instead of the welding tool

On top of that I added a check to ensure you can't disassemble the same girder
more than once to farm materials
 2015-05-05 10:32:57 +12:00
Cheridan
5bbf2be174 Merge pull request #9233 from Firecage/Operatingcuffing 
Allows you to buckle people to an operating table.
 2015-05-04 09:15:41 -05:00
Cheridan
191e011c14 Merge pull request #9272 from phil235/BundleFix7 
animal knockdown, nettle soup, defib, extinguisher fixes
 2015-05-04 00:26:22 -05:00
xxalpha
c0c4f8f4b6 Barsign 2015-05-03 15:01:16 +01:00
astralenigma
78fdf5e1f7 I think I'm done but I'm always wrong 
Removed secure/new() due to it's current uselessness
Put all changes in the secure overlays inside the update icon
Found a bug where EMP act would only unlock the crate instead of
breaking it but would still apply the emag overlay I defaulted the fix
to breaking the crate.
Moved the variables from emag act and emp act upwards for compliance
with the update_icon() checks.
 2015-05-02 21:37:33 +01:00
Jordie
3606662c88 Merge pull request #9106 from phil235/BundleFix5 
Cyborgs, MMIs, and other fixes
 2015-05-02 23:59:22 +10:00
Ikarrus
b331391aa5 Batons for Light ERT 
Moved the batons from the lockers to their backpacks so light ERTs can use them
 2015-05-01 21:30:34 -06:00
astralenigma
fe8e7f3f65 Moved the overlays.cut() per request. 2015-05-02 02:12:17 +01:00
phil235
be1708483e - Fixed nettle soup recipe says abstract nettle. 
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
 2015-05-02 01:34:38 +02:00
astralenigma
8d72d9ef2b Second attempt at overlay 
None of the crates appear with the manifesto outside, but he's there
waiting lurking in the shadows waiting to strike.
 2015-05-01 08:01:54 +01:00
astralenigma
30b86c060f The manifest code is completed in the crate 
just need to fix possible bugs that I find.
 2015-05-01 02:57:39 +01:00
astralenigma
d84bfc0f2b Putting all on github now. 
Only crates is missing the overlay of the manifesto.
 2015-05-01 00:33:21 +01:00
Incoming
7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies 
Conflicts:
	code/game/machinery/teleporter.dm
 2015-04-29 13:37:01 -04:00
Firecage
03ca264eb1 Allows you to buckle people to an operating table. 2015-04-29 16:04:22 +02:00
Jordie
6bbc274789 Merge pull request #9073 from RemieRichards/DrawPixel 
Adds DrawPixel() + Easels + Canvases!
 2015-04-28 23:45:38 +10:00
Jordie0608
a6b3deda96 Merge branch 'master' of https://github.com/tgstation/-tg-station into doesrussellsteapotapplytorussellsteapot 
Conflicts:
	icons/obj/closet.dmi
 2015-04-28 22:31:11 +10:00
phil235
9132838420 Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5 
Conflicts:
	code/game/machinery/computer/ai_core.dm
	code/game/objects/items.dm
	code/game/objects/items/robot/robot_parts.dm
	code/modules/mob/living/carbon/brain/MMI.dm
 2015-04-25 19:52:14 +02:00
phil235
35047e646e Readjusted rad effect from uranium walls. 
mob/living/silicon/ai/ai.dm : one simplification plus "Normal" -> "Nominal".
 2015-04-25 19:37:38 +02:00
kingofkosmos
d9b8b146c8 Tried to fix merge conflicts, hopefully worked. 2015-04-24 21:52:36 +03:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos
72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00