cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-28 02:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,675 Commits 59 Branches 14 Tags
6b29fecda1e96e93bae99ec1af94b6695b361f8f
Commit Graph

8583 Commits

Author SHA1 Message Date
MrPerson
6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r 
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
 2014-03-08 22:03:03 -08:00
Aranclanos
f5e49728ac Merge pull request #3025 from Steelpoint/master 
Officers spawn with Stun Baton V2
 2014-03-09 00:34:21 -02:00
Steelpoint
55beb8c8b3 TakeTwo 2014-03-08 23:50:15 +08:00
Rockdtben
bf995b001b Merge pull request #3019 from drynwyn/master 
Switch tournament gangster ammo to match weapon
 2014-03-08 08:36:53 -06:00
Aranclanos
b637ac6fa8 Merge pull request #2889 from RobRichards1997/23/02/2014-Fuck-Nuke-Disk 
Prevents the Nuke disk from going through the Gateway [Ready]
 2014-03-08 01:27:34 -02:00
Aranclanos
3fbfc9bad7 Merge pull request #2835 from Razharas/MechRechargers 
Mech rechanging changes
 2014-03-08 00:50:48 -02:00
Robson Richards
49e0cbd125 Reworked arguments to suit new GetTypeInAllContents 2014-03-07 21:06:46 +00:00
Robson Richards
0b07ae9f72 Merge branch 'master' of https://github.com/tgstation/-tg-station into 23/02/2014-Fuck-Nuke-Disk 2014-03-07 20:55:34 +00:00
drynwyn
abefc24a87 Switch gangster ammo to match weapon 
Fixes #2988
 2014-03-07 09:54:59 -05:00
Ergovisavi
062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
Ergovisavi
6cfe2398d9 Changed around the way things are attacked by objects and got rid of the tapping message as it can screw with afterattack stuff. 2014-03-07 03:19:12 -08:00
Razharas
259e908086 Fixing powercell path 2014-03-07 08:04:59 +04:00
Razharas
dd1d094be8 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRechargers 2014-03-07 08:01:10 +04:00
Aranclanos
d2e0bafa7a Merge pull request #3008 from Aranclanos/VendingRefillRuntimes 
Vending refill runtimes fix
 2014-03-07 00:31:34 -02:00
Cheridan
95be5e8651 Merge pull request #2996 from Aranclanos/CyborgEndRoundRuntime 
Roundend report mindless cyborgs runtime fix
 2014-03-06 12:33:15 -06:00
Aranclanos
433cc27797 CRASHING AND CRASHING AND CRASHING AND CRASHING 2014-03-06 15:15:08 -03:00
Aranclanos
fb64ae9a41 the vending refill objects won't runtime anymore at roundstart if they were placed in the map 2014-03-06 10:20:48 -03:00
Ergovisavi
a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 
Item attack changes
 2014-03-06 03:17:02 -08:00
Aranclanos
74cb68ef0e Fixes a runtime regarding the round end report, if a cyborg doesn't have a mind it won't be displayed anymore. 2014-03-05 16:50:15 -03:00
Cheridan
a2fb8bc3eb Merge pull request #2983 from ChuckTheSheep/TC-Green-Text 
Fix  for Nuker's TC Green Text.
 2014-03-05 00:18:49 -06:00
ChuckTheSheep
5e127f0183 Whoops 2014-03-05 01:14:32 -05:00
ChuckTheSheep
394ecc4197 Bad Ass 2014-03-05 01:13:43 -05:00
ChuckTheSheep
07a3eac4a8 Syndicate Balloon instead of MLG 2014-03-05 00:46:56 -05:00
ChuckTheSheep
caf64b8666 Revert "Cheridan Hates Fun" 
This reverts commit bf42b8f38e.
 2014-03-05 00:30:35 -05:00
ChuckTheSheep
bf42b8f38e Cheridan Hates Fun 2014-03-05 00:18:00 -05:00
Cheridan
2058d863b1 Merge pull request #2944 from ChuckTheSheep/Recursive-Recursive-Recursive-Recursive 
Recursive Rewrites
 2014-03-04 23:16:39 -06:00
Razharas
c548df264b Conflict fix 2014-03-05 06:30:29 +04:00
Cheridan
37d5917a1d Merge pull request #2978 from Sugarette/spellcheck 
A very minor spellcheck
 2014-03-04 17:05:39 -06:00
Cheridan
1cf3af0d72 Merge pull request #2973 from Kelenius/master 
Seed extractor as storage
 2014-03-04 17:04:22 -06:00
ChuckTheSheep
2e9fcdeb56 MLG NUKERS 2 PRO 2014-03-04 17:25:58 -05:00
ChuckTheSheep
c172a60230 MLG 2PRO 2014-03-04 17:12:43 -05:00
ChuckTheSheep
f4e2d30749 Made uplink_owner key rather than name 
Had issues with clowns/mimes/nuke ops due to name changes.
 2014-03-04 14:55:03 -05:00
Cheridan
a98113ffbd Merge pull request #2969 from Aranclanos/Linda 
Linda changes
 2014-03-04 03:53:56 -06:00
Cheridan
ab7a9c6266 Merge pull request #2965 from RandomMarine/plusonehat 
Makes wizard hat defenses match the robe.
 2014-03-04 03:05:07 -06:00
Cheridan
5d30d1923e Merge pull request #2970 from Ergovisavi/bangarang 
Flashbang tweaks
 2014-03-04 02:59:10 -06:00
Cheridan
8307933d30 Merge pull request #2916 from Incoming5643/ventcrawlinginmyskin 
Improved/Expanded Ventcrawling
 2014-03-04 02:50:38 -06:00
ChuckTheSheep
0916de9bcf Shiiiiiet 2014-03-04 00:20:47 -05:00
MrSnapwalk
00fd755b8c Automerge Fix 2: Electric Boogaloo 
This is why we can't have nice things.
 2014-03-03 20:12:30 -06:00
Razharas
5e61e9ea76 Merge pull request #2960 from hornygranny/balancepass 
combat rebalance tweaks
 2014-03-03 17:59:39 -08:00
Cheridan
530a81d15c Merge pull request #2966 from Mloc/tg-wtfaccess 
Optimizes /obj/New() by removing access generation
 2014-03-03 19:02:52 -06:00
Sugarette
33e554c8d0 Another typo 2014-03-04 02:54:24 +03:00
Aranclanos
b65eb773f9 Merge pull request #2968 from Razharas/TEST 
Autodrobe fix
 2014-03-03 21:12:27 -02:00
Cheridan
d4c81ce247 Merge pull request #2936 from MrPerson/jitterbug_dizzydummies 
Redo of jitteriness and dizziness.
 2014-03-03 11:35:27 -06:00
Cheridan
3f479ae19c Merge pull request #2964 from Miauw62/praisethehelixfossil 
Adds a Dissonant Shriek power for changelings that causes an EMP.
 2014-03-03 11:29:26 -06:00
MrPerson
1ff2cd3e92 Somehow the box away code file got unticked. 2014-03-03 05:47:17 -08:00
MrPerson
80a7a2abb4 Replaced a few more Del() and del() calls 
Removed cigarette related reagent deleting. It's already done in atom/Destroy()!
 2014-03-03 04:51:09 -08:00
MrPerson
a74cdf1da2 Made the singulo only qdel things once. Woops. 
This was causing some runtimes and doubled reporting "Emitter deleted at (0,0,0)" etc.
 2014-03-03 03:45:59 -08:00
Kelenius
4675af9f19 Seed extractor upgrade 2014-03-03 15:38:16 +04:00
MrPerson
d784ce8941 Remove a debug qdel() command. 
Made atmos_alert computers GC (hopefully) and not runtime (known).
 2014-03-03 02:49:57 -08:00
MrPerson
20027aa442 Fix a use_power() runtime if the object was in nullspace (was qdel()'d) 
Also remove some debug shit in atmospherics I left around.
 2014-03-03 01:16:21 -08:00