cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,319 Commits 61 Branches 14 Tags
9bc2b0a8cc6af7e8eeb460d69fcdb166ee01d89c
Commit Graph

6330 Commits

Author SHA1 Message Date
Aranclanos
0f1945bef6 Merge pull request #13051 from kingofkosmos/enableidtopdaonfloor 
ID into PDA without PDA in your inventory and a few other similar things
 2015-11-23 20:27:07 -03:00
phil235
77de108fe7 Merge pull request #13143 from Anonus/blobactors 
Fixes up blob_act()
 2015-11-22 18:42:15 +01:00
phil235
ab1e9f2d15 Merge pull request #13160 from Firecage/optablefix 
Fixes op table buckling Take #2
 2015-11-22 18:38:19 +01:00
Firecage
e1891440fa Fixes op table buckling 2015-11-22 19:29:26 +02:00
Nerd Lord
f458c2cead The blob eats nondense things in all cases. 
Probably fixes one or two bugs in the process.
 2015-11-20 21:03:43 -05:00
octareenroon91
d2fa527045 Add numbers and star graffiti to crayon/spraycan designs. 2015-11-19 17:24:09 -06:00
Cheridan
4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof 
Adds subtypesof(path)
 2015-11-19 16:31:09 -06:00
Cheridan
1edef8ac6a Merge pull request #13068 from tkdrg/rollitbaby 
Fixes roller bed teleportation exploit
 2015-11-19 14:38:29 -06:00
Remie Richards
7333bede43 Merge pull request #13055 from Anonus/actionbuttons 
Gives constructs action buttons, adds cool effects to cult turfs.
 2015-11-18 20:26:47 +00:00
Nerd Lord
9437d6fc27 BETTER workaround. 2015-11-18 15:21:04 -05:00
Cheridan
cba8a9a325 Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix 
Conflicts:
	code/modules/mob/mob.dm
 2015-11-18 01:44:29 -06:00
kingofkosmos
a121b9308c Removes unneeded restrained-warnings and one canUseTopic-check. 2015-11-18 06:08:31 +02:00
kingofkosmos
38e5420832 Removes can_use -proc from PDA.dm and replaces all instances of it with canUseTopic. 
Adds kingofkosmos to admins.txt
 2015-11-17 21:26:42 +02:00
Nerd Lord
a183e0474d Pooling is good for the soul. 2015-11-17 11:27:26 -05:00
Razharas
b3ed636d3c Merge pull request #13034 from kingofkosmos/shardspacenoslip 
Stops glass shards from hurting you in space
 2015-11-17 05:33:15 +03:00
Tkdrg
292ba6c046 Fixes roller bed teleportation exploit 
Thanks swankcookie for reporting this to me ingame.
 2015-11-16 22:30:26 -03:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path. 
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
 2015-11-16 18:55:57 -05:00
Nerd Lord
757d009e4f Constructs now have action buttons! 
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
 2015-11-16 15:20:13 -05:00
kingofkosmos
62987c0716 Enables putting an ID into a PDA when the PDA not in your inventory. 2015-11-16 20:41:11 +02:00
Razharas
e9dae3be88 Merge pull request #13015 from SuperSayu/Holodecker 
Holodeck Upgrades [MAP]
 2015-11-16 04:51:49 +03:00
Vincent
faf5ddaceb Holodeck refactor and Enchancements 
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
 2015-11-15 20:23:23 -05:00
duncathan salt
1a54000a35 Merge pull request #13020 from Xhuis/this_pr_was_a_time_sink 
Sink changes
 2015-11-15 16:02:14 -06:00
duncathan salt
7f48bf70f5 Merge pull request #13027 from tkdrg/FUK 
Pickup() improvements
 2015-11-15 15:59:05 -06:00
kingofkosmos
156d9b558c Crossing a glass shard in space without shoes won't hurt and stun the user anymore. 2015-11-15 17:19:07 +02:00
duncathan salt
328c9537e7 Merge pull request #13013 from tkdrg/bugs 
Logging improvements
 2015-11-14 23:45:45 -06:00
duncathan salt
f26a4fa106 Merge pull request #12992 from phil235/ProjectileSuicideFixes 
Fixes your shield blocking the bullets when committing suicide with a
 2015-11-14 23:43:55 -06:00
duncathan salt
31e30ab768 Merge pull request #12955 from CosmicScientist/FixingThePast 
Makes the dehydrated carp less ambiguous and decreases its TC cost
 2015-11-14 23:42:58 -06:00
Tkdrg
11ab5901ee Pickup() improvements 
Fixes flashlight exploit.
Removes unused proc can_use_hands().

Fixes #11282
 2015-11-14 17:05:08 -03:00
Cheridan
9a68f6b69b Merge pull request #13003 from Incoming5643/stop_being_broken_at_being_broken 
The further trials and tribulations of the supermatter sword bugfix
 2015-11-14 11:49:55 -06:00
Xhuis
a24ddbd7b7 Sink changes 2015-11-14 09:44:39 -05:00
Cheridan
894784acab Merge pull request #12967 from Anonus/burnbabyburn 
Makes anomalies more dangerous
 2015-11-13 22:23:34 -06:00
Tkdrg
021b99badb Logging improvements 
Fixes SMES deconstruction logging.
Radiation will no longer message admins unless a living mob is hit.
All rad pulses will still be saved to logs.
Also adds a JMP link to the rad pulse message.

Fixes #12442
Fixes #12609
 2015-11-13 18:08:23 -03:00
Incoming
bf34b97b1e Gives supermatter swords a better check for adjacency, and moves the parent code below the dust code to be extra sure <b>nothing escapes</b>. 
I started up a test server and was smacking people to dust like a pro, armor or not.
 2015-11-13 01:13:05 -05:00
duncathan salt
df6ac90baa Revert "Revert "Merge pull request #12067 from AnturK/resequencing"" 2015-11-12 15:25:31 -06:00
phil235
e20e03562a Fixes your shield blocking the bullets when committing suicide with a gun. 
Merged kill_count and range var into one var/range for obj/item/projectile.
Simplified projectile/proc/Range().
Fixes timestoped projectiles still calling Range() and thus being deleted despite being stopped.
Fixes projectile being invisible when on the first tile in front of the shooter (which meant no sprite showing when shooting a target 1 tile away)
Simplifies kinetic/Range()
 2015-11-12 19:45:50 +01:00
Razharas
3992858ed1 Revert "Merge pull request #12067 from AnturK/resequencing" 
This reverts commit d5fd4440ea, reversing
changes made to 605710d0ec.

Reverting this bullshit
 2015-11-12 21:11:50 +03:00
duncathan salt
4fcdc7d748 Merge pull request #12950 from phil235/AIMechStunFix 
Fixes flashbanged mmis in mechs losing access to most mech functions
 2015-11-11 16:34:24 -06:00
duncathan salt
b1d1ecb81f Merge pull request #12904 from Incoming5643/action_action_action_action_action 
Adds action buttons for slimes
 2015-11-11 15:21:05 -06:00
Incoming
d8a0dc6b54 jumps through hoops to save two lines 
adds slime growth as a define
 2015-11-11 16:00:38 -05:00
Nerd Lord
e19757bca3 MY CODE QUALITY IS BASED ON WHAT I'M MESSING WITH 2015-11-11 15:20:48 -05:00
Nerd Lord
182f4ed16b Shaved a few lines off. 2015-11-11 14:57:02 -05:00
Nerd Lord
f8464b97ef Makes anomalies somewhat more dangerous; hyper-energetic flux anomaly will shock mobs that run into it(or if it runs into them), bluespace anomaly will occasionally teleport mobs away from it in a small radius, vortex anomalies will sometimes throw objects at nearby living mobs, and pyroclastic anomalies will produce MORE FIRE, MORE HEAT, MORE BURNING, and if not disabled, they will burst into flame and the resulting slime will be rabid and thus attack much more aggressively. 
Also fixes a bug where gravitational anomalies were doing if(!target) throw stuff instead of If(target) throw stuff, meaning it'd either do nothing or runtime.

In addition, anomalies move more often, are resistant to explosions and will only be destroyed if they are in devastation range(but why are you bombing it)
 2015-11-11 12:41:07 -05:00
duncathan salt
d5fd4440ea Merge pull request #12067 from AnturK/resequencing 
Changes to DNA Injectors
 2015-11-11 10:50:30 -06:00
duncathan salt
0769ba5c00 Merge pull request #12945 from torger597/master 
Adds a Syringe to the Uplink Poison/Chemical kit
 2015-11-11 10:47:40 -06:00
duncathan salt
8bb0043ec7 Merge pull request #12939 from KorPhaeron/really_bad_ideas 
Adds a series of ridiculous weapons to the wizard spellbook
 2015-11-11 10:47:04 -06:00
duncathan salt
9339662a28 Merge pull request #12768 from xxalpha/windows10 
Made it possible to paint windows to make them opaque.
 2015-11-11 10:32:18 -06:00
phil235
5e43d2b570 Merge pull request #12924 from Firecage/Optable 
Changes the operating table to be an actual table.
 2015-11-11 17:31:38 +01:00
AnturK
d82010caf3 Makes injectors timed 
Update
Lowers the scanner buffer transfer radiation.
Makes injector duration scale with upgrades.
Time coefficent values
 2015-11-11 17:27:55 +01:00
phil235
79d25ef2d9 Fixes remotely detonating planted c4 with signaler. 
Move CanUseTopic() procs to the correct files.
 2015-11-11 15:57:05 +01:00
duncathan salt
e5f8c3f941 Merge pull request #12900 from KorPhaeron/laserbox 
Immovable reflectors for admins/mappers
 2015-11-10 23:21:20 -06:00