cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,181 Commits 61 Branches 14 Tags
21cb80b79e67f7749cdd6746e0c41dc14aed4bea
Commit Graph

8978 Commits

Author SHA1 Message Date
phil235
21cb80b79e fixing CP var 2014-04-05 17:35:12 +02:00
phil235
d07450ad47 Adds message at end of pipe slicing 
* Adds message at the end of pipe slicing operation.
* Simplify code checking if player/tool moves during pipe slicing.
* adds span class everywhere.
 2014-04-05 17:22:04 +02:00
phil235
5a6e9804b9 Bin&outlet can be deconstructed even with destroyed trunk 
Fixes the bug where you can't deconstruct the bin/outlet after the trunk below it has been destroyed (usually by an explosion) and you can't replace the trunk with the bin/outlet in the way.
 2014-04-05 16:44:22 +02:00
Miauw62
24e1e89afb Merge pull request #3260 from Incoming5643/Realism 
Minor fix to improve realism
 2014-04-01 19:55:33 +02:00
Incoming
af47580b20 Humans Named John McClane can crawl through the vents. 
This helps increase realism and believability in our 2D spessman games.
 2014-04-01 12:45:28 -04:00
Aranclanos
ed692bcaf7 Merge pull request #3258 from MrPerson/wizard_WOOPSIES 
Fixed a serious as fuck bug where wizard spells don't recharge
 2014-04-01 09:59:39 -03:00
MrPerson
f1645bcf64 Fixed a serious as fuck bug where wizard spells don't recharge 2014-04-01 05:56:06 -07:00
Razharas
f618fe556e Merge pull request #3241 from Miauw62/aprilfools2014ian 
April fools
 2014-04-01 05:54:22 -07:00
Miauw62
823c59502f Merge pull request #3234 from Rockdtben/fixAdminDB 
hue
 2014-04-01 14:21:34 +02:00
Cheridan
302f2ea122 Merge pull request #3215 from MrStonedOne/silicon-macros-and-hotkeys 
Gives cyborgs ai click shortcuts, adds some click shortcuts, and gives borgs more meaningful hotkeys
 2014-04-01 01:27:39 -05:00
Aranclanos
6c1150dca3 Merge pull request #3143 from Malkevin/saccult 
Sacrifice Cult
 2014-04-01 02:18:39 -03:00
MrStonedOne
25fe463eb2 Ensures re-humaned cyborgs get normal macros. 2014-03-31 22:04:33 -07:00
Aranclanos
e41332f959 Merge pull request #3253 from Aranclanos/forgotthis 
right so more stuff I forgot
 2014-04-01 01:57:04 -03:00
Aranclanos
953acabcda right so more stuff I forgot 2014-04-01 01:56:16 -03:00
Cheridan
222f769b0c Merge pull request #3091 from Incoming5643/diehardwithaventgeance 
Fixes #3084
 2014-03-31 21:39:32 -05:00
Cheridan
8b8e7e8a24 Merge pull request #3204 from MrPerson/disposal_verb_tab 
Move disposal pipe verbs to the object tab
 2014-03-31 21:37:49 -05:00
Cheridan
354dbeacde Merge pull request #3219 from phil235/ReqConsoleFix4 
Adding hacking messages for fire alarm & requests console
 2014-03-31 20:28:37 -05:00
Malkevin
a35f993c69 Changed the fast move code from a bunch of has_reagents checks to a bitflag check. 
The reagents turn on the flag per on_mob_life proc run, the flag is turned off if a check for the reagents fails, the check is called when reagents are deleted
 2014-04-01 00:50:42 +01:00
Cheridan
5fce1835b2 Merge pull request #3144 from Ikarrus/borgdebug 
Debugging Cyborgs during Construction
 2014-03-31 18:48:50 -05:00
Cheridan
d92fae006d Merge pull request #3189 from Kelenius/master 
Hydroponics fixes, #2992, #3002, chemicals, attackby()
 2014-03-31 17:58:10 -05:00
Malkevin
0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
fleure
d38a85bcc0 Merge pull request #3231 from phil235/AddDesigns2 
Adding four boards to the list of R&D circuit designs
 2014-03-31 19:42:26 +01:00
fleure
cccb3dcf76 Merge pull request #3226 from Giacom/syndicate_fab 
Syndicate Suit Fashion
 2014-03-31 19:35:45 +01:00
fleure
db1ac17930 Merge pull request #3214 from Niknakflak/Lasertagequipment 
Adds Laser Tag Equipment set to admin verb: "Select Equipment"
 2014-03-31 19:27:21 +01:00
fleure
f3e280b65f Merge pull request #3228 from Giacom/crush_my_heart 
Feedback messages for the crusher.
 2014-03-31 19:18:54 +01:00
Incoming
335c4591ad Just uses Login() 2014-03-31 13:30:19 -04:00
Aranclanos
b84d47717d Merge pull request #3191 from Steelpoint/LaserChange 
Laser Gun Ammo Buff + Sprite Change for Red Laser Tag
 2014-03-31 14:02:21 -03:00
Razharas
d1fbcf2457 Merge pull request #3227 from fleure/tankfix 
Watertank nozzles no longer delete
 2014-03-31 09:48:57 -07:00
MrPerson
e2defa667a Upgrades to the play admin midi client pref 
Toggling it off will pause any songs currently playing. Toggling it back on will resume playback from where you were.
Toggling midis on will play the currently playing admin midi, if there is one.
 2014-03-31 05:41:33 -07:00
Steelpoint
fd32b3ebda Removes LaserTagLaser Sprite Change + Reduces Laser Gun Ammo 2014-03-31 15:49:08 +08:00
Aranclanos
a140850349 Merge pull request #3242 from Aranclanos/HappyCLicks 
Making the game better for everyone.
 2014-03-30 22:14:20 -03:00
Aranclanos
f411ff8dfa Merge pull request #3238 from Giacom/advance_cache 
Advance diseases cache the generated id to help stop the amount of calls to sortList.
 2014-03-30 22:13:45 -03:00
Aranclanos
594443cf5e For the start of the month, I'll make combat more robust because I think everyone is pretty unrobust. 
This won't be reverted.
Happy clicks.
 2014-03-30 22:12:24 -03:00
Miauw
83176c5ee2 improves le corgis immensely xd 2014-03-30 20:06:06 +02:00
Giacomand
d07519629c Advance diseases cache the generated id to help stop the amount of calls to sortList. 2014-03-30 12:44:00 +01:00
Rockdtben
117b51be0e Added a better error message 2014-03-29 16:58:55 -05:00
Rockdtben
3d0d5b4fb2 Fixed some issues with the DB admin system 
-erro_admin_ranks table did not exist
-passing a string in to admin new instead of a rank.
 2014-03-29 16:56:42 -05:00
Razharas
039e816872 Merge pull request #3223 from GunHog/Proxsensor 
Adds prox sensor to the autolathe.
 2014-03-29 14:38:28 -07:00
Razharas
ee7f6c314d Merge pull request #3222 from phil235/aloefix 
Changes Aloe cocktail recipe
 2014-03-29 13:36:34 -07:00
phil235
7d44b66c28 Fixes one typo 2014-03-29 18:16:44 +01:00
phil235
e682348d53 Adding four boards to the list of R&D circuit designs 
Adds the boards for telecom traffic control console, telescience console, mechbay recharger and vendor to the list of R&D designs.
Fixes some minor typos.
 2014-03-29 18:13:04 +01:00
Malkevin
d4e0052d03 mob.dm 2014-03-29 17:05:34 +00:00
Malkevin
c3552606f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-29 16:59:14 +00:00
Razharas
6cb3ae5183 Revert "Merge pull request #3142 from Alek2ander/master" 
This reverts commit 6f9b58abce, reversing
changes made to eda7110a23.

Im so sorry aran, so sorry
 2014-03-29 18:02:54 +04:00
Giacomand
7ad6696cf7 Feedback messages for the crusher. 2014-03-29 13:26:24 +00:00
Razharas
e63a01aff0 Merge pull request #3220 from Rockdtben/fixFollowBug 
Fixes #2852
 2014-03-29 06:26:06 -07:00
Razharas
c320676170 Merge pull request #3213 from Incoming5643/ventfixer 
Fixes a small bug in ventcrawling
 2014-03-29 06:25:17 -07:00
Razharas
79d255be20 Merge pull request #3203 from MrPerson/qdel_table 
Make wrenching tables apart not drop the wrench
 2014-03-29 06:24:23 -07:00
Razharas
594ca98cce Merge pull request #3202 from Niknakflak/WeldMaskTypo 
Fixes Typo with welding masks/goggles.
 2014-03-29 06:21:12 -07:00
Razharas
24491ad36b Merge pull request #3188 from Rockdtben/NewscasterCommandReports 
Newscasters will now show Central Command Updates.
 2014-03-29 06:20:10 -07:00