cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,376 Commits 61 Branches 14 Tags
5641bf7983ca0641eb8048cb4ec9ca0c7d3cb92d
Commit Graph

8088 Commits

Author SHA1 Message Date
oranges
5641bf7983 Merge pull request #18936 from MrStonedOne/patch-222 
Fixes charter/War declaration not respecting true round start time.
 2016-06-28 00:05:40 +12:00
AnturK
1919e723a7 Merge pull request #18932 from SnipeDragon/cutout-fix 
Cardboard Cutouts now become opaque on appearance change.
 2016-06-27 10:20:20 +02:00
Joan Lung
afa8ee8058 Merge pull request #18927 from coiax/wrong-turf-charter 
Rejecting charter names is now visible
 2016-06-26 18:41:19 -04:00
Joan Lung
75106bb789 Hopefully fixes THAT ONE BUG (#18926) 2016-06-26 17:56:55 -04:00
Cheridan
339dfb24a3 Merge pull request #18919 from coiax/big-graffiti-nerf 
Changes to large graffiti
 2016-06-26 16:09:25 -05:00
Jack Edge
673492ea52 Code review II 
Because Joan is a stickler for sprite accuracy.
 2016-06-26 20:19:59 +01:00
Kyle Spier-Swenson
5e2bf79e16 Fixes charter not respecting true round start time. 2016-06-26 04:21:52 -07:00
SnipeDragon
d732607d17 Cardboard Cutouts now become opaque on appearance change. 2016-06-26 00:28:43 -05:00
Jack Edge
a09544992c Merge branch 'master' into shuttle-processing 
Conflicts:
	code/modules/shuttle/ripple.dm
 2016-06-26 01:00:25 +01:00
Jack Edge
ba22f1116b Rejecting charter names is now visible 
Before it'd make a visual message at the user's location (ie. the admin
that rejected it).

Now it makes a message at the charter's location.
 2016-06-26 00:00:26 +01:00
Jack Edge
0d10a1f950 Changes to large graffiti 
🆑 coiax
rscdel: Large graffiti now consumes 5 uses from limited use crayons and
spraycans, as well as taking three times the amount of time to draw.
/🆑

- Also fixes bug where clown colorful reagent wasn't being applied to
all three turfs.
 2016-06-25 21:54:49 +01:00
Joan Lung
be2466b97c Merge pull request #18889 from coiax/cleanup-2 
Code cleanup; silicons, melee, hallucinations
 2016-06-25 15:42:49 -04:00
Jack Edge
415d88ddb6 Code review I 2016-06-25 20:26:59 +01:00
Jack Edge
a78b2a65fd Code review I 2016-06-25 19:21:19 +01:00
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
Jack Edge
87016bc6cd Code cleaning; countdown for transformer 
🆑 coiax
rscadd: Observers now have a visible countdown for borg factories,
silicons can examine the factory to determine how long it has remaining
until it is ready.
/🆑

- Removes a bunch of spawns and trailing returns
 2016-06-25 11:40:03 +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
Jack Edge
67a5079598 Compile fixes I 2016-06-24 14:13:02 +01:00
Jack Edge
a841bd14f5 Code cleanup; silicons, melee, hallucinations 
- Cleaned up paint.dm
- Everything else should be self explanatory
- Removed braindamage part of esword, since you can't reach that; it
  would be handled by attack_self()
 2016-06-24 14:03:44 +01: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