cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 22:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,421 Commits 61 Branches 14 Tags
031a98d14c7e6df2dfd8b7bab3dcd83c9338cd41
Commit Graph

1381 Commits

Author SHA1 Message Date
Iamgoofball
856edee625 WHOOPS 2015-06-23 12:57:28 -07:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
 2015-06-23 12:54:26 -07:00
Cheridan
62e635484a Merge pull request #10069 from Ikarrus/gangrecruitnerf 
Gang Update: Recruitment Edition
 2015-06-23 14:33:13 -05:00
Cheridan
e3fa954daa Merge pull request #10025 from phil235/WindowBugFix 
Two window/windoor bugfixes
 2015-06-23 12:23:32 -05:00
Ikarrus
3b326a973b Additional Changes 2015-06-22 22:29:51 -06:00
Remie Richards
c79963f7b7 Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE 
Malf AI module changes + Mechs for normal AIs!
 2015-06-21 00:30:03 +01:00
Remie Richards
ee1e30717a Merge pull request #9980 from LaharlMontogmmery/ContentTransfer 
Container Content Transfer - Good for Review (Again...Again.)
 2015-06-21 00:09:19 +01:00
Swag McYolosteinen
859c5e66e0 Merge pull request #9930 from duncathan/givinunarysomelovin 
Brings some unary devices closer to the present
 2015-06-20 20:14:02 +02:00
Swag McYolosteinen
7929b7dcd7 Merge pull request #10031 from Ikarrus/gangfashion 
Gang Update: Fashion War Edition
 2015-06-20 18:06:19 +02:00
Jordie0608
538d4ad303 Merge branch 'master' of https://github.com/tgstation/-tg-station into glassisapaintosprite 
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
 2015-06-20 18:37:39 +10:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen 
Various admin improvements
 2015-06-20 00:53:30 -05:00
Cheridan
a45804dcfe Merge pull request #10033 from optimumtact/reeeeeeee_hitby_messages 
Hitby messages removed, may help with singularity lag from throwing
 2015-06-20 00:19:03 -05:00
Xhuis
2823a98244 Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-19 11:23:45 -04:00
Swag McYolosteinen
1dde070d18 Merge pull request #9800 from Dorsisdwarf/wittybranchname 
Buffs nuke ops [merge ready]
 2015-06-19 12:00:23 +02:00
Ikarrus
e27cdc7efe Resolved Conflicts: 
code/game/gamemodes/gang/dominator.dm
 2015-06-18 23:05:51 -06:00
Xhuis
e1356f889e Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-18 23:37:06 -04:00
oranges
ea1df76a6d Hitby messages removed, may help with singularity lag from throwing 2015-06-19 15:32:56 +12:00
Ikarrus
46a5e578e4 Gang Update: Fashion War Edition 
This update primarily deals with gang outfits and expands on how they affect the round.
 2015-06-18 20:01:57 -06:00
LaharlMontogmmery
373c918a4a Going through some hOOPs - bit of a overhaul. 2015-06-18 17:40:35 +02:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass 
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
 2015-06-18 15:50:35 +02:00
phil235
91f05d1a21 Fixes windoor not being damaged by fires. Fixes not being to attack windows with a welder on harm intent. 2015-06-18 14:57:24 +02:00
Cheridan
ee87a1dc23 Merge pull request #9974 from phil235/MirrorRaceChangeFix 
Mirror race change fix
 2015-06-17 12:54:19 -05:00
Xhuis
3bc466a0ff Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-16 11:42:47 -04:00
Jordie0608
0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen 
Conflicts:
	code/modules/admin/verbs/pray.dm
 2015-06-16 17:24:20 +10:00
GunHog
fd27d9d3bb Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE 
Conflicts:
	code/game/gamemodes/malfunction/Malf_Modules.dm
 2015-06-15 12:26:28 -05:00
GunHog
0b611acd7b Compile fix 
Fixes the things after resolving merge conflicts.
 2015-06-15 12:15:29 -05:00
GunHog
bc11259282 Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE 
Conflicts:
	code/game/machinery/computer/aifixer.dm
 2015-06-15 11:27:11 -05:00
phil235
ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval 
Unnecessary space removal from spans and messages
 2015-06-15 18:20:04 +02:00
phil235
d275152a96 Fixes the wizard magic mirror race change. 
Fixes the "race swap" wizard event.
 2015-06-15 17:01:07 +02:00
Jordie0608
8fc003029c Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2015-06-15 16:34:56 +10:00
Iamgoofball
a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00
Cheridan
ec8cd61d4c Merge pull request #9808 from Incoming5643/march_of_the_snowflakes 
WJohn's Hyper Customizable Lizard Sprites
 2015-06-14 17:40:20 -05:00
Cheridan
e9419764f7 Merge pull request #9929 from kingofkosmos/seclockerfix 
Locker unlocks if you attack it with an empty hand
 2015-06-14 17:12:44 -05:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Cheridan
565e4dda5a Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit 
Overlays for computers
 2015-06-14 10:25:27 -05:00
Jordie0608
a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations: 
"span class = '" changed to "span class='"
"'> " changed to "'>"
 2015-06-14 12:13:19 +03:00
Iamgoofball
4de75c539f Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/table_frames.dm
	code/game/objects/structures/windoor_assembly.dm
 2015-06-13 14:20:17 -07:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
duncathan
9d64ca0e0c makes the game compile 
fixes more icon paths
I gave zvent the vent_map icon as a placeholder because it's not like it's even used anyway
 2015-06-13 12:33:31 -06:00
Jordie0608
752f5e883d eol conversion 2015-06-13 20:15:49 +10:00
Jordie0608
5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
duncathan
dab13732fe cleans up icon paths; modifies certain unary devices 
updates icon paths in multiple files
removed insulated icon state in pipe_item.dmi (insulateds are deaaaad)
lays an icon framework so that o2 generators, cold sinks, heat sinks may eventually be made constructable
  they no longer override update_icon() but instead update like just about every other device
  eventually I'll give these real sprites but given that they're unused it can wait for now
  sprites and construction are outside the scope of this PR
makes heat exchangers update their color based on their node
  because heat exchangers are different sprite-wise they had to override update_icon entirely
makes heat exchanger, heat sinks, cold sinks, o2 generators non-dense
 2015-06-13 02:43:17 -06:00
kingofkosmos
899f2f5119 Security locker unlocks if you attack it with an empty hand. 2015-06-13 11:20:33 +03:00
Razharas
b7150068cc Merge pull request #9783 from nukeop/master 
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
 2015-06-13 04:42:16 +03:00
Razharas
7dbd3b13da Merge pull request #9872 from xxalpha/itsalwaystrue 
Fixes infinite cyborg stack usage on a couple of things.
 2015-06-13 04:34:05 +03:00
Razharas
4373f6eece Merge pull request #9904 from xxalpha/runtimesrun 
Fixes three runtimes.
 2015-06-13 04:29:20 +03:00
Incoming
595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list 
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
 2015-06-12 00:43:35 -04:00
xxalpha
9ba7e6aaf4 Fixes three runtimes. 
Better fix. src. purge
 2015-06-11 21:30:13 +01:00
Dorsisdwarf
7afd81e083 removes loaded bag from locker, adds to uplink at discounted price. Lowers cost of least-used ammo type 2015-06-11 08:09:36 +01:00