cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,875 Commits 61 Branches 14 Tags
78dc371e41dd8977c19f47c08ecd46b43ef55cf6
Commit Graph

16821 Commits

Author SHA1 Message Date
Remie Richards
78dc371e41 Merge pull request #9537 from AnturK/refactor 
Makes spellbook datum-based.
 2015-06-07 15:14:08 +01:00
Remie Richards
bca9c627ee Merge pull request #9767 from Iamgoofball/patch-71 
Re-adds kekchems
 2015-06-07 12:38:33 +01:00
Razharas
0e28326097 Merge pull request #9779 from Cheridan/touching_linda 
Pressure_resistance Tweaks
 2015-06-07 04:57:52 +03:00
phil235
ccd4137a9d Merge pull request #8974 from kingofkosmos/mopbucket 
Mopping with just a bucket
 2015-06-06 13:18:07 +02:00
Razharas
bedd645fbb Merge pull request #9810 from Cheridan/it_keeps_happening 
Makes code compile
 2015-06-06 06:12:55 +03:00
Cheridan
9e65cdeb6a Merge pull request #9391 from Ikarrus/gangmessaging 
Gang-Wide Messages
 2015-06-05 22:01:54 -05:00
Cheridan
100fa3a6d8 Merge pull request #9627 from Aranclanos/AIMalfRoboFactory 
Malf AI robotic factory building feedback overlays
 2015-06-05 21:28:07 -05:00
Cheridan
67fcf7730a Makes code compile 
goddamnit travis thanks a lot
 2015-06-05 21:20:02 -05:00
Ikarrus
ed46350f42 Pens now have a flat cooldown rate of 60 seconds 2015-06-05 19:57:22 -06:00
Cheridan
adfb237de3 Merge pull request #9696 from Incoming5643/why_cant_we_be_friends 
Escape alone joint greentext + escaping on the nuke op shuttle
 2015-06-05 17:16:11 -05:00
Cheridan
6ca4cb1e64 Merge pull request #9735 from Jordie0608/whyevenhavetwoverbs 
World.Reboot() Improvement
 2015-06-05 16:43:13 -05:00
Cheridan
f79a2eb0ab Merge pull request #9770 from bear1ake/walls-dense! 
Fixes non dense, non air-proof indestructible walls.
 2015-06-05 00:32:08 -05:00
Cheridan
0429224064 Merge pull request #9432 from RemieRichards/TailWagging 
Adds lizard tail wagging
 2015-06-04 22:08:19 -05:00
Cheridan
33cbb5ebd9 Merge pull request #9667 from GunHog/Cargo_Needs_Love 
Adds Destination Tagger and Hand Labeler to Autolathe
 2015-06-04 20:29:13 -05:00
Cheridan
842e3f3239 Merge pull request #9741 from palpatine213/SecHudEmag 
Allows HUDs to be emagged with an emag as well as an EMP
 2015-06-04 20:19:39 -05:00
Cheridan
05072bcf31 Merge pull request #9771 from xxalpha/dropitlikeits 
Fixed PDA accepting items when spessmen can't drop items.
 2015-06-04 20:04:04 -05:00
palpatine213
cb9f124ff1 Removed redundant code. 2015-06-04 13:20:15 -07:00
Carl Ivanov
fdc4e7231e Update turf.dm 2015-06-04 14:03:14 +09:00
Cheridan
6c12887367 Pressure_resistance Tweaks 
-Adjusts pressure resistance, which determines how easily things can get pushed around by atmos.
-Most items (handheld stuff) are less resistant, while most larger items (mobs, structures, machinery) are more resistant.
-Removes the cooldown on air pushing stuff, which should make it feel more 'responsive', as opposed to the current push->pause->push->pause effect it does now.
-MAGBOOTS/NOSLIPS NOW PREVENT SPACEWIND PUSHING! !!!
-Adds a little wooshy breeze sound to when you would get pushed
 2015-06-03 23:22:25 -05:00
Iamgoofball
0886e0e731 whoops 2015-06-03 18:06:05 -07:00
Iamgoofball
f11d042798 BY POPULAR REQUEST: Adds ODs to trekchems. 2015-06-03 17:56:36 -07:00
xxalpha
ecb15b21c2 Fixed PDA accepting items when spessmen can't drop items. 2015-06-03 20:16:11 +01:00
Carl Ivanov
f7b84a0aea DENSITY = 1! 
Make centcom walls dense.
 2015-06-04 02:02:55 +09:00
kingofkosmos
6b58fb55fa Unnecessary isprox-check removed. 2015-06-03 19:03:38 +03:00
Cheridan
ed8dffca94 Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome 
Bugfix: Witticism depleted editon
 2015-06-03 09:49:51 -05:00
AnturK
a4fbd97528 Adds summon sounds back 2015-06-03 16:32:56 +02:00
AnturK
d9d5b99724 Just in case 2015-06-03 16:30:03 +02:00
AnturK
e18a39da47 Splits the Spells into Offensive/Utility 
Moves Uses to fake tab
Drops js implementation
 2015-06-03 16:30:03 +02:00
AnturK
68509859c6 Spellbook refactor 2015-06-03 16:30:02 +02:00
Jordie0608
d6892f4f0f removed brainloss check pending larger fix of canuseTopic instances 2015-06-03 18:03:49 +10:00
Cheridan
e4999fd233 Merge pull request #9719 from CandyClownTG/patch-1 
Ointments and bruise packs stacking
 2015-06-03 00:51:02 -05:00
Cheridan
12fcb957c0 Merge pull request #9725 from MrStonedOne/patch-15 
Fixes paper burning causing lag
 2015-06-02 23:34:54 -05:00
Cheridan
a19f1801ff Merge pull request #9699 from KorPhaeron/turf 
Changes how destroying/building turfs works
 2015-06-02 23:15:42 -05:00
Cheridan
2d998452db Merge pull request #9715 from Firecage/datumspaths 
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
 2015-06-02 23:04:51 -05:00
Cheridan
d31f534446 Merge pull request #9745 from Incoming5643/super_bummer_man_64 
Fixes overexcited TTV reporting
 2015-06-02 22:04:20 -05:00
Iamgoofball
688ec672d0 Re-adds trekchems 
Wanted to save this for #10000, but eh, too long of a wait.

requested by literally everyone ever

no recipes atm while I find ones that don't clash/rewrite some recipes
 2015-06-02 17:42:53 -07:00
palpatine213
631a0e1884 Changes to use emag_act() 2015-06-02 17:29:05 -07:00
Cheridan
905f350597 Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2 
Conflicts:
	code/game/smoothwall.dm
 2015-06-02 13:45:56 -05:00
Aranclanos
dea72572c1 Created a new path of turfs, /turf/indestructible, they are only walls, turfs that are non interactive and static, like the splash screen or the borders of the different spawn spots of centcomm Z level (like wizard or nuke ops) 
Fixes a few dirs of turfs in centcomm
 2015-06-02 14:38:55 -03:00
Jordie
bd0f38f1bc Merge pull request #9535 from RemieRichards/IBetYouDontEvenUnderstandSmoothwalls 
Ports /vg/s Smoothwall code
 2015-06-02 16:31:42 +10:00
Incoming
e608a16edf Tank Transfer Valves won't pester the admins if the volume of the two tanks are equivilent before they are mixed. 99999/100000 times this means that the tank was already opened once and fouled, and the remaining 1/100000 the toxins guy was AMAZINGLY crap at his job. 2015-06-01 23:11:42 -04:00
Aranclanos
e7c0d7e95c Removes unsimulated turfs. 
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
 2015-06-01 23:24:18 -03:00
palpatine213
d1ff29c278 Let's both emags and EMPs affect huds 2015-06-01 18:19:07 -07:00
palpatine213
15700e1530 Changes Hud emagging from EMP to Emag 2015-06-01 16:15:10 -07:00
Jordie0608
bd7019e033 standardizes Reboot(), allows round to be delayed after it finishes and removes immediate reboot verb 2015-06-01 22:07:22 +10:00
Jordie0608
33a4a73fe1 adds fallbacks for jobs if spawnpoints dont exist 2015-06-01 17:36:28 +10:00
Incoming
061478165a upgrades the HARDFEET species flag to PIERCEIMMUNE 
In addition to keeping golem feet safe as always golems are now immune to object embeding. As a mitagating nerf and logical extension, golems can no longer be injected with chems either.
 2015-05-31 18:54:30 -04:00
Cheridan
2aa0247b00 Merge pull request #9701 from Cuboos/SoundsEp2_WizardBoogaloo 
Wizard Sounds has the update. Been a bit since i've done a commit, so…
 2015-05-31 15:51:59 -05:00
Cheridan
b36a1506b7 Merge pull request #9683 from spasticVerbalizer/apostropheCatastrophe 
Makes AI camera track link not break on weird characters
 2015-05-31 15:29:46 -05:00
Cheridan
9dc7dc17ab Merge pull request #9678 from spasticVerbalizer/injuryCheckMessage 
Changes injury check message to be less misleading, fixes #9600
 2015-05-31 15:23:30 -05:00