cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,265 Commits 61 Branches 14 Tags
14606bea5e59e33c9e8aee671b2cedf1007dd0ef
Commit Graph

6997 Commits

Author SHA1 Message Date
AnturK
dbeec9a194 Merge pull request #15402 from octareenroon91/FIX-SORD-FIX 
Refactor suicide
 2016-02-12 16:49:06 +01:00
Joan Lung
35ab127543 Merge pull request #15389 from KorPhaeron/babydontfearthereaper 
Fixes reaper scythe item_state
 2016-02-11 12:30:01 -05:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc 
Fix a number of runtimes
 2016-02-10 23:50:38 -06:00
duncathan salt
ca8e3c6a0a Merge pull request #15157 from LanCartwright/nomorehardsuit 
Removes hardsuit from bulldog bundle
 2016-02-10 21:21:42 -06:00
Cheridan
eeb96cb7a5 Merge pull request #15360 from neersighted/ionsomething 
Remove borg jetpack, give them ion thrusters instead
 2016-02-10 18:19:13 -06:00
Bjorn Neergaard
27a838c17f Fix crate access; fix locker item-to-lock 2016-02-10 17:40:10 -06:00
AnturK
2c0dcb17de Merge pull request #15280 from phil235/VisionUpdatesChanges 
Some adjustments to the new vision code
 2016-02-10 23:20:20 +01:00
tkdrg
41901027db Merge pull request #15362 from lzimann/table 
Some table fixing
 2016-02-10 19:18:32 -03:00
phil235
0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
 2016-02-10 22:35:19 +01:00
octareenroon91
61796470b8 Fix suicide_act message text 2016-02-10 15:22:09 -06:00
octareenroon91
ae21d76bf8 Refactor suicide 
Buff the SORD: you can now do 200 damage. Of stamina damage. To yourself. By attempting suicide.
 2016-02-10 15:01:08 -06:00
KorPhaeron
bbd20807b7 Indents with tabs instead of spaces 2016-02-10 10:38:51 -06:00
AnturK
559ab8fa6f Merge pull request #15354 from neersighted/call_me_cratezy 
Allow horizontal mobs to fit into crates
 2016-02-10 16:17:19 +01:00
Bjorn Neergaard
e4f3045487 Add spacecat 
Fixes a revert in my last crate PR, spacecat added to asteroid
secret room (previously included a cat critter crate)
 2016-02-10 09:15:03 -06:00
Bjorn Neergaard
a16f554c35 Allow horizontal mobs to fit into crates 
Also make stuffing into crates/lockers a mild stun akin to tabling
 2016-02-10 09:14:58 -06:00
Bjorn Neergaard
85e80780ce Fix storage runtime 
Mobs without clients can't see into storage! They have no screen!

The following runtime has occured 92 time(s).
runtime error: Cannot read null.screen
proc name: show to (/obj/item/weapon/storage/proc/show_to)
  source file: storage.dm,104
  usr: Leo Pfeifer (/mob/living/carbon/human)
  src: the backpack (/obj/item/weapon/storage/backpack)
 2016-02-10 07:20:25 -06:00
KorPhaeron
3c2c923b22 Fixes scythe item_state 2016-02-10 05:06:18 -06:00
AnturK
b2268b30ad Merge pull request #14851 from MrStonedOne/patch-130 
[Ready]Tesla balance and code cleanup
 2016-02-10 11:36:32 +01:00
duncathan salt
9a6300e2a2 Merge pull request #15173 from KorPhaeron/holy 
Allows the chaplain to choose his holy weapon theme
 2016-02-09 23:42:56 -06:00
KorPhaeron
91ecb5a603 Fix for the fix 2016-02-09 23:31:34 -06:00
KorPhaeron
2566e424b3 Fixes, special effects for whip and carp 2016-02-09 23:14:50 -06:00
Leo
9ff6f0b0b2 Removes return 2016-02-09 19:54:46 -02:00
Lzimann
831d2e04cc Fix tabecrafting menu opening when you click the table 
Also adds a cursor change when you drag the table to you. And fixes tablecrafting menu not opening if the table is empty.
 2016-02-09 19:46:39 -02:00
Bjorn Neergaard
173387eefc Remove borg jetpack, give them ion thrusters instead 
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
 2016-02-09 14:53:37 -06:00
AnturK
03890d2ea4 Merge pull request #15250 from ChangelingRain/blobtooweak 
Adds five new blob chemicals and some blob tweaks
 2016-02-09 18:04:55 +01:00
tkdrg
ba2e629525 Merge pull request #15286 from AnturK/bagofboom 
Adds C4 bag to uplink
 2016-02-08 21:39:31 -03:00
Bjorn Neergaard
f97c8a00f2 Internals action button 2016-02-08 17:10:04 -06:00
Bjorn Neergaard
eaa6bc7b18 Implement better jetpack action button 2016-02-08 17:09:12 -06:00
KorPhaeron
d25e113ecc Removes unused defines 2016-02-08 11:15:45 -06:00
KorPhaeron
c2b77be84b Better list/choosing of holy weapons 2016-02-08 11:12:33 -06:00
AnturK
f6f7943189 Adds C4 bag to uplink 2016-02-08 16:10:34 +01:00
tkdrg
6e9441b81e Merge pull request #15269 from AnturK/fixerinio 
Fixes crayon/spraycan buffer mode.
 2016-02-08 11:42:46 -03:00
tkdrg
3bd79ccadb Merge pull request #15262 from neersighted/damnshuttle 
Rework crates, supply packs, and supply orders
 2016-02-08 11:36:26 -03:00
Bjorn Neergaard
39421efeb3 Address feedback 2016-02-08 07:22:18 -06:00
Bjorn Neergaard
f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
Bjorn Neergaard
209fa5ffe6 Add internals to critter crates; factor more crate code into closets 2016-02-08 01:01:49 -06:00
MrStonedOne
60d068e6fa Merge remote-tracking branch 'upstream/master' into patch-130 
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/objs.dm
	code/modules/reagents/reagent_dispenser.dm
 2016-02-07 17:41:42 -08:00
tkdrg
7dc0de7a87 Merge pull request #15239 from TrustyGun/janikeys 
The janitor's belt can now hold his janicart keys.
 2016-02-07 21:18:21 -03:00
phil235
83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping) 
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
 2016-02-07 18:50:18 +01:00
AnturK
ed47afaa05 Fixes crayon/spraycan buffer mode. 2016-02-07 13:18:10 +01:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Bjorn Neergaard
ddab6823d3 Fix up crates 
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
 2016-02-07 01:20:37 -06:00
Bjorn Neergaard
ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -06:00
Nerd Lord
c28c1203cd Adds five new blob chemicals. 
Blob mobs now heal for 2.5% of their maxhealth when blob_act()ed, basically whenever they're on the blob
Blob expansion no longer has a chance to fail inversely proportional with the expanding blob's health.
Blobbernauts have slight color differences.
 2016-02-06 19:32:30 -05:00
phil235
99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/modules/reagents/chemistry/holder.dm
 2016-02-06 20:38:16 +01:00
phil235
aed7794f50 Made changes to adjust with neersighted's fullscreen overlays pr. 
Fixed Xray users getting vision impairment overlays when inside a container.
Fixes mob inside mecha getting the mech sight flags despite not being the pilot.
"get_vision_impairments" is renamed to "get_remote_view_fullscreens".
Fixes AI blindness.
 2016-02-06 20:35:15 +01:00
tkdrg
e6cb39624e Merge pull request #15208 from KorPhaeron/pinpointer 
Gives ops pinpointers by default
 2016-02-06 16:27:25 -03:00
KorPhaeron
66f8d450ac Chaplain weapon code cleanup 2016-02-06 12:10:48 -06:00
KorPhaeron
9b9da55178 Removes excess pinpointers 2016-02-06 11:37:29 -06:00
tkdrg
7b602a35b5 Merge pull request #15217 from neersighted/flashy 
Fix flashlights flashing
 2016-02-06 14:21:14 -03:00