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

809 Commits

Author SHA1 Message Date
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
phil235
3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing 
The Nanoing (Episode 2: The Fix Wars)
 2015-06-22 14:24:20 +02: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
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen 
Various admin improvements
 2015-06-20 00:53:30 -05: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
Remie Richards
8820662c31 Merge pull request #9847 from Xhuis/ALL_HAIL_LORD_SINGULOTH 
ALL HAIL GOD-EMPEROR SINGULOTH
 2015-06-17 10:47:35 +01: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
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
aaf8f2893f Merge pull request #9922 from Iamgoofball/patch-80 
Removes RNG chance to fail to emag an APC, along with the emag delay
 2015-06-15 14:16:55 +02:00
Iamgoofball
a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07: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
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
5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
Iamgoofball
7b475df05e removes the do_after() from emagging apcs 2015-06-12 15:49:22 -07:00
Iamgoofball
a19e95dba5 Removes RNG chance to fail to emag an APC 
literally why was this a thing

see the pr that removes it from borgs for reasoning
 2015-06-12 14:59:05 -07:00
Iamgoofball
f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
Razharas
b873176a77 Merge pull request #9821 from Cheridan/just_cuff_my_shit_up 
REMOVES CABLE CUFFS...
 2015-06-10 01:17:35 +03:00
Xhuis
a9c5a1d9ea Adds a stage six singularity. 2015-06-08 14:36:50 -04:00
Iamgoofball
988ff28734 adds panel open icons for the new buildables 2015-06-07 03:55:28 -07:00
Cheridan
46acc2a55d REMOVES CABLE CUFF 2015-06-06 16:21:41 -05:00
Iamgoofball
b65c7a36df Upgrade Update: Bluespace Boogaloo 2015-06-05 23:56:09 -07: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
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
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
KorPhaeron
97990c94cc Changes how destroying turfs works 
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.

Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).

Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).

Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.

Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.

I should have done this years ago for away missions.

Also added myself to admins.txt
 2015-05-29 18:43:34 -05:00
Cheridan
cbb91c601f Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses 
Bugfix goes Forth+1
 2015-05-24 23:39:40 -05:00
phil235
f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02:00
Jordie0608
68eda1787b fixes cells corrupt()ing maxcharge, mime spells as borg and condi botles not allowing naming 2015-05-23 19:56:03 +10:00
Cheridan
9dfc13cbb7 Merge pull request #9491 from RemieRichards/ManyImageCaches 
Misc Image Caches
 2015-05-15 13:44:21 -05:00
Razharas
3410d3a0f6 Merge pull request #9461 from xxalpha/petethegoat 
A handful of fixes.
 2015-05-15 02:05:16 +03:00
Remie Richards
28cd8ea0f1 Image Caches: 
Mining rock turf edge overlays
Alien weed overlays
SMES overlays
 2015-05-14 16:40:15 +01:00
xxalpha
4da1eb4399 Fixed emitter beams not being reflectable. 2015-05-13 21:45:46 +01: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
Fayrik
474bf2667c Almost like magic, it works. CODE MAGIC. 2015-05-12 22:23:25 +01:00
Remie Richards
7e0e50302a Merge pull request #9436 from MrStonedOne/powerfixes 
Merges power subsystem into machine subsystem.
 2015-05-10 08:23:20 +01:00
MrStonedOne
c6c7237265 Merges power subsystem into machine subsystem. 
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
 2015-05-09 23:48:18 -07: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
Jordie0608
7369992d3d further reorganization, elimination of old defines folder 2015-05-09 23:16:57 +10:00
Jordie
279a2653c6 Merge pull request #9347 from SamuelRowe/master 
Spelling and grammar fixes *FIXED*
 2015-05-09 20:31:54 +10:00
Jordie
2febf4dacd Merge pull request #9293 from xxalpha/cable_color 
Engineering Cyborgs can now change their cable coil color.
 2015-05-08 22:10:58 +10:00
Samuel Rowe
c8ea983267 More 2015-05-07 11:20:14 +12:00
Cheridan
e91300f07d Merge pull request #9168 from Ikarrus/SMES_boost 
[MAP] Doubles Initial Engineering SMES charge
 2015-05-06 09:28:04 -05:00
Remie Richards
2234a9b25e powernet datums now manually clear references, subsystem/proc/postpone() now takes an optional "cycles" argument, for postponing more than 1 cycle, Explosions are less laggy! 2015-05-03 04:39:48 +01:00
xxalpha
ba823213d2 Added ability for cyborgs to pick their cable coil color. 2015-05-03 00:43:21 +01:00
xxalpha
638ccf8503 Changed engineering cyborg cable coils to be randomly colored. 2015-05-02 23:10:53 +01:00