cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,279 Commits 61 Branches 14 Tags
ef15462ec7a8f7d81fd7791cfd5be2efdcf78e2f
Commit Graph

8071 Commits

Author SHA1 Message Date
Jack Edge
ef15462ec7 Fix some potential runtimes 2016-06-25 18:23:01 +01:00
Jack Edge
93ed77f8db World timer for toys 2016-06-25 17:59:28 +01:00
Jack Edge
7aef42ae8b spawn() removal on effects_*.dm 2016-06-25 17:50:47 +01:00
Jack Edge
c374782ebf A lot of shuttle changes 2016-06-25 17:28:46 +01:00
Jack Edge
201da77121 Fixing some bugs with sparkles 2016-06-25 16:51:19 +01:00
Jack Edge
27d6c284ed Merge branch 'fun-balloon' into shuttle-processing 
Conflicts:
	_maps/shuttles/emergency_bar.dmm
	_maps/shuttles/emergency_narnar.dmm
	code/modules/spells/spell_types/wizard.dm
 2016-06-25 16:26:22 +01:00
oranges
9427c39155 Merge pull request #18872 from ChangelingRain/poolorgib 
Pools several unpooled overlay/temp objects
 2016-06-25 17:34:30 +12:00
oranges
41e3acc71d Merge pull request #18820 from Xhuis/the_pinnacle_of_deception_technology 
Adds cardboard cutouts
 2016-06-24 20:14:59 +12:00
Joan Lung
8259247e13 fixes medical holosign 2016-06-23 22:51:16 -04:00
Joan Lung
5a9985674f Merge pull request #18852 from swankcookie/gauze_fix 
Changes "Bandage" to "improvised gauze"
 2016-06-23 21:05:40 -04:00
Xhuis
16999b6d2b Makes cutouts vulnerable to bullets 2016-06-23 18:18:40 -04:00
Jack Edge
ee3ce06a50 Merge branch 'master' into template-checking 2016-06-23 22:39:49 +01:00
Joan Lung
e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -05:00
Swankcookie
df25fde271 Changes "Bandage" to "improvised gauze" 2016-06-22 18:36:03 -05:00
oranges
0432cd9bb4 Merge pull request #18484 from coiax/random-space 
All of space is now randomised
 2016-06-23 09:12:48 +12:00
Jack Edge
e1943df2c8 Finally finishes whiteship_meta 2016-06-22 22:04:22 +01:00
oranges
ca7067eded Merge pull request #18741 from KorPhaeron/tacticalespionageaction 
Tactical Espionage Action
 2016-06-22 12:08:05 +12:00
Xhuis
369ad867de Adds cardboard cutouts 2016-06-21 17:57:53 -04:00
Joan Lung
8c8c69c8ac Merge pull request #18714 from coiax/fridge-magnet 
Station rename logging, admin reject button
 2016-06-21 08:46:17 -04:00
Jack Edge
3e30473365 Applied MSO's proposed changes 2016-06-21 13:34:36 +01:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3 
Remove spawn III
 2016-06-21 20:11:08 +12:00
PKPenguin321
01d4d02b70 conflicts + undo loc changes 
attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs
 2016-06-20 22:22:50 -07:00
oranges
e2718408df Merge pull request #18720 from Supermichael777/Flaps-fix 
Makes beapsky able to use his room and all bots be able to use flaps
 2016-06-21 09:35:15 +12:00
Supermichael777
f35a410ab6 Stupid github didnt show your coment the first time 2016-06-20 09:16:47 -04:00
Jack Edge
5da579b7c4 Merge branch 'master' into random-space 
Conflicts:
	_maps/asteroidstation.dm
 2016-06-20 13:06:08 +01:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703) 
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
 2016-06-20 12:07:44 +02:00
oranges
bce99c4f58 Merge pull request #18668 from coiax/dropdel 
Adds DROPDEL flag; items will qdel() on dropped()
 2016-06-20 11:08:31 +12:00
oranges
72371fcdc7 Merge pull request #18693 from Core0verload/list_overhead 
Reduces list init overhead a tiny bit
 2016-06-20 10:59:48 +12:00
Supermichael777
f6dd9cc402 Actualy fixes the bug because OBTUSE PROC NAMES. 2016-06-19 18:53:44 -04:00
oranges
448e386ac4 Merge pull request #18649 from Xhuis/my_eyes_have_seen_that_which_cannot_be_comprehended 
Reagent tank optimization
 2016-06-20 08:18:33 +12:00
oranges
7dc92e3f98 Merge pull request #18647 from TechnoAlchemisto/I_was_lucky_if_papa_went_for_me_first_because_then_at_least_I_would_be_too_disoriented_to_realize_what_he_was_doing_to_sis 
Adds hard cider to the bar.
 2016-06-20 08:18:05 +12:00
KorPhaeron
74e451e7ce Sneaking Mission 2016-06-19 14:39:39 -05:00
Joan Lung
20860f2d6a Merge pull request #18646 from Cruix/languages_split 
Splits languages into languages_spoken and languages_understood.
 2016-06-19 15:23:38 -04:00
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
coiax
961a6c4c26 Adds potted plants to cargo packs (#18662) 
🆑 coiax
rscadd: Potted plants can now be ordered from cargo.
/🆑
 2016-06-19 14:05:18 -05:00
Cheridan
944b695ec3 Merge pull request #18660 from coiax/fix-17560 
All living mobs can now attempt to pick up cards
 2016-06-19 13:37:59 -05:00
Joan Lung
b941a47a60 Adds cogscarabs to clock cult (#18685) 
* Adds cogscarabs to clock cult

* playstyle string

* info

* oh good going

* no static

* delay it eating all the metal

* scarab removal service

* cog

* ree

* error handling

* todo: languages = RATVAR

* isclockmob

* very large box

* faintly glowing eyes
 2016-06-19 17:26:35 +02:00
WJohn
55428bb8ad Merge pull request #18593 from pudl/cool-carpet 
Re-implements old carpet sprite
 2016-06-19 08:20:02 -04:00
Jack Edge
9185f06d31 Removes spawn from things 2016-06-19 01:25:29 +01:00
Supermichael777
a17e676f05 Such a hard fix pudl 2016-06-18 14:23:00 -04:00
Jack Edge
4b70b35c3e Back by popular demand, custom naming 2016-06-18 17:36:03 +01:00
Jack Edge
55c56a9f29 Modifies station charter to use piecemeal naming 2016-06-18 16:19:42 +01:00
c0
0abc91c59d slot_equipment_priority no longer contributes to list init overhead 2016-06-18 05:09:15 +03:00
c0
1311fb9b43 Reduces list overhead a tiny bit 2016-06-18 04:38:49 +03:00
unknown
706988154b Resolved conflicts 2016-06-17 18:56:51 -04:00
oranges
35faba0411 Merge pull request #18627 from coiax/fix-18276 
Glowshrooms don't grow on lava or water
 2016-06-18 10:35:59 +12:00
TechnoAlchemist
ecf0acd3bf Thanks Phil! 2016-06-17 13:34:41 -07:00
Jack Edge
a13719c17a Code review 2016-06-17 17:16:40 +01:00
Jack Edge
8ca69eabbb Adds DROPDEL flag; items will qdel() on dropped() 
Pretty self explanatory, replaces writing a dropped() proc that just
calls qdel() with a flag that does it for you.
 2016-06-17 12:14:28 +01:00
Jack Edge
64d6cb636c All living mobs can now attempt to pick up cards 
Fixes #17560.

Removes ishuman() check, replaces with effective isliving() check, a la
paper bins.
 2016-06-17 09:48:20 +01:00