cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 20:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,961 Commits 61 Branches 14 Tags
38605d1aeee51f1e4b9c364b0b30c6e825252c3c
Commit Graph

19287 Commits

Author SHA1 Message Date
Remie Richards
38605d1aee Merge pull request #11712 from MrStonedOne/patch-37 
Ghost follow is now an orbit!
 2015-09-13 16:42:05 +01:00
Kyle Spier-Swenson
cf390ae1ef Fixes orbiting a deleted atom sending you to null space 
This also handles the garbage collection issues. As far as i'm concerned, if its been qdeled, but loc isn't null, it's fair game for orbits.
 2015-09-13 08:35:22 -07:00
Swag McYolosteinen
0f6705d856 Merge pull request #11560 from Fox-McCloud/runereveal 
Fixes Bibles Not Revealing Runes
 2015-09-13 17:32:40 +02:00
Swag McYolosteinen
30b140ae8a Merge pull request #11603 from Fox-McCloud/stimulantsfix 
Fixes Stimulants Speedbuff
 2015-09-13 17:32:19 +02:00
Swag McYolosteinen
49968d033d Merge pull request #11675 from MrStonedOne/patch-36 
Fixes text gurbling in coms console and shuttle call's priority announcement
 2015-09-13 17:31:51 +02:00
Swag McYolosteinen
b5e4eefe8b Merge pull request #11685 from bgobandit/fuckingprogressbarsfuck 
Mop progress bar now actually works.
 2015-09-13 17:30:50 +02:00
Swag McYolosteinen
ed2858c2e2 Merge pull request #11737 from xxalpha/itsakindofmagic 
Fixed eye wear overriding see_invisible when it shouldn't.
 2015-09-13 17:27:19 +02:00
Swag McYolosteinen
ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes 
Tableclimbing & reagent runtime fixes
 2015-09-13 17:26:33 +02:00
Swag McYolosteinen
05195d98b2 Merge pull request #11693 from Jordie0608/ofcoursemoreregexisgoodwhatareyoutalkingabout 
Fixes loading jobs from .txt
 2015-09-13 17:24:54 +02:00
Swag McYolosteinen
d57fac141a Merge pull request #11724 from RemieRichards/LargeInhands 
Inhands can now come in ANY SIZE, not just 32x32!
 2015-09-13 17:23:36 +02:00
Jordie
3e6f0c87bf Merge pull request #11731 from Fox-McCloud/Impropermaterials 
Fixes Consistency Issue with Materials
 2015-09-13 23:13:22 +10:00
Jordie
e718214a67 Merge pull request #11734 from Menshin/sheets_inserting_safety_checks 
Adds boundary checks for stack sheets inserting
 2015-09-13 23:13:04 +10:00
Fox-McCloud
9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Jordie
77911b67ba Merge pull request #11709 from bgobandit/fuckyouslimesfuckfuckfuck 
Fixes pink slime potions.
 2015-09-13 21:59:08 +10:00
Jordie
2e731a6603 Merge pull request #11726 from Aranclanos/warningmob 
removing the null in mob list warning
 2015-09-13 21:56:38 +10:00
Jordie
a4549ee9b3 Merge pull request #11727 from Aranclanos/goliathstentacles 
Fixes goliath tentacles not deleting themselves
 2015-09-13 21:56:22 +10:00
Jordie
7530c0e133 Merge pull request #11680 from bgobandit/honktarget 
Adds a clown shooting target.
 2015-09-13 21:50:53 +10:00
Jordie
d75295a9f6 Merge pull request #11577 from Jalleo/x 
Fixes custom cult structure in library backroom
 2015-09-13 21:47:56 +10:00
Jordie
15e50de0fe Merge pull request #11694 from bear1ake/point-zero 
Remove a bunch of useless .0 in vars
 2015-09-13 21:47:09 +10:00
Jordie
6c8bb6f518 Merge pull request #11632 from bgobandit/dirtymininglies 
Fixes asteroid turfs showing up as "mineral deposit."
 2015-09-13 21:45:56 +10:00
Jordie
5a34de7bd3 Merge pull request #11699 from Incoming5643/dirtyspaceman 
Fixes lizard looking odd with helmets
 2015-09-13 21:45:44 +10:00
Jordie
a1a2417d46 Merge pull request #11681 from GunHog/MalfReportMiniFix 
AI Malfunction round-end report mini-fix
 2015-09-13 21:45:03 +10:00
Jordie
47fb102125 Merge pull request #11633 from bgobandit/cocosprite 
Coffee and tea mugs now appear empty when empty.
 2015-09-13 21:44:42 +10:00
Jordie
2ca388bf9f Merge pull request #11696 from Shadowlight213/Edswarmfix 
Modifies the Dispense Wizard Justice spell to correct some issues
 2015-09-13 21:44:23 +10:00
Jordie
f02589180d Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem 
Added a taser function back to the Advanced Energy Gun
 2015-09-13 21:42:45 +10:00
Menshin
89ce4e112d Stored the material name in case the stack was deleted after the sleep() when dealing with overlays. 2015-09-13 01:57:21 +02:00
Cheridan
683b0803f7 Merge pull request #11722 from Hamadryad-1/Fixes-infinite-resources-in-Orion-Trail 
Fixes Infinite Resources in Orion Trail
 2015-09-12 18:51:20 -05:00
Fox-McCloud
ffa823e5b9 floor tile materials fixup 2015-09-12 16:11:48 -04:00
xxalpha
701a5c7949 Fixed eye wear overriding see_invisible when it shouldn't. 
minmax
 2015-09-12 17:34:03 +01:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero 
Conflicts:
	code/modules/research/protolathe.dm
 2015-09-12 21:07:40 +09:00
Menshin
ce2ee15b57 * Added boundary checks for stack sheets inserting (fixes #11732) 
* Limited material inserting to stack sheets for the protolathe and banana shoes
 2015-09-12 12:11:57 +02:00
Fox-McCloud
89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
Razharas
f9a01d1365 Merge pull request #11580 from xxalpha/protocontainer 
Changed protolathe code to use material container.
 2015-09-12 08:56:47 +03:00
Razharas
fbe1781374 Merge pull request #11609 from AnturK/outfits 
Outfit datum
 2015-09-12 08:56:12 +03:00
Razharas
4f9e6a33e0 Merge pull request #11678 from GunHog/ChemHeaterBoardFix 
Fixes missing chem heater board design
 2015-09-12 08:53:30 +03:00
Aranclanos
4b7cc90478 Fixes goliath tentacles not deleting themselves on a really particular situation, killing the mob with the tentacle hit. The mob must also delete itself on death. 2015-09-12 00:40:42 -03:00
Aranclanos
4477dbe4f7 Removes the warning of a null inside of the mob list, it was alerting for false positives. 2015-09-12 00:20:07 -03:00
Remie Richards
82e577be0b Items may now have inhands from 1x1 (why) to INFINITYxINFINITY (again, WHY), this allows for ridiculously large items! 
Adds a center_image() proc that centers an image larger or smaller than world.icon_size (32) so that it appears in the center of a human mob, like inhands.
 2015-09-12 00:45:14 +01:00
A Manifestation
f76e8e8af5 Fixed! 2015-09-11 14:30:13 -07:00
phil235
1db6687314 little tweak 2015-09-11 18:19:10 +02:00
Kyle Spier-Swenson
144402c8c7 I slept so I should make sure A still exists 2015-09-11 09:19:04 -07:00
phil235
c069ea0a7d Fixes runtime in monkey/attack_hand() 
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
Fixes runtime with krokodil addiction
Xenomorph can no longer get addicted or overdose on reagents.
 2015-09-11 18:08:54 +02:00
Kyle Spier-Swenson
fa73524804 Some code clean up 2015-09-11 07:33:30 -07:00
xxalpha
28889d2b6a Changed protolathe code to use material container. 
Clean proc, typo fix

Standard sheet values
 2015-09-11 12:39:32 +01:00
Razharas
426a242f68 Merge pull request #11627 from Jordie0608/thebiblewastheoriginalredtape 
Resolves #5748, see jobban reasons from char setup
 2015-09-11 14:16:54 +03:00
Razharas
3a63c31614 Merge pull request #11626 from Memendia/master 
Suicide txt fix
 2015-09-11 14:16:30 +03:00
Razharas
45fb337732 Merge pull request #11487 from bgobandit/matsblastusa 
Adds materials to some items for recycling purposes.
 2015-09-11 14:03:18 +03:00
Jordie0608
7d457a2d66 regex improvement 2015-09-11 21:00:25 +10:00
Razharas
a08a394da4 Merge pull request #11337 from phil235/ReagentReactionRuntimeFix 
reagent reaction and device assembly fixes
 2015-09-11 13:56:49 +03:00
Kyle Spier-Swenson
28e550d8c1 Fixes bug where orbiting while orbiting would break orbits 2015-09-10 23:17:27 -07:00