cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,321 Commits 61 Branches 14 Tags
c31c76b4ab55d65be746ebcd99edceb8cf7cb64e
Commit Graph

4492 Commits

Author SHA1 Message Date
Razharas
ff27f5d426 Merge pull request #2826 from YotaXP/polaroid-fix 
Long overdue fixes to the Polaroid cameras.
 2014-02-20 16:22:59 -08:00
fleure
b86cb8dfb8 Merge pull request #2841 from Aranclanos/box2550 
Removes the away mission box2550
 2014-02-20 10:12:07 +00:00
fleure
e38a012697 Merge pull request #2840 from Aranclanos/hatsaway 
removes the chance of your hat flying off
 2014-02-20 10:11:43 +00:00
fleure
8108cb1b7f Merge pull request #2811 from Ccomp5950/master 
Code effeciency project: apc icon_update()
 2014-02-19 19:09:05 +00:00
fleure
5cf93a55ea Merge pull request #2804 from Perakp/borgAnimations 
Animated cyborg transformations
 2014-02-19 19:02:34 +00:00
fleure
ad1c13a2d3 Merge pull request #2828 from Mercenaryblue/Lasertag2 
Issue #2684 Fixed
 2014-02-19 18:46:52 +00:00
fleure
e80dd57ef4 Merge pull request #2819 from YotaXP/fix-1957 
Fixes major security exploit regarding JavaScript injection.
 2014-02-19 18:34:48 +00:00
Aranclanos
19e4407e0d removes the chance of your hat flying off 2014-02-19 07:00:14 -03:00
Aranclanos
e5ba65bb78 Removes the away mission box2550 2014-02-19 06:53:15 -03:00
Razharas
5a8eed4c32 Merge pull request #2824 from hornygranny/throw_range 
throw_range pass
 2014-02-18 16:17:13 -08:00
Perakp
bf6f9d3786 If this works I'll be very happy 
I think I’ll try to merge these commits later.
 2014-02-19 00:42:15 +02:00
Perakp
9f43935f89 Trying to fix mob.dm merge conflicts 
I’ll do this over and over again until it works
 2014-02-19 00:28:22 +02:00
Perakp
965e7ad6d8 Merge to master 
Conflicts in mob.dm
 2014-02-18 23:59:59 +02:00
YotaXP
35ba26b3ea Fixed coloring, overlays on overlays, and blood trails. 2014-02-18 16:54:22 -05:00
Miauw
fe9a5b0513 DONT PANIC DONT PANIC DONT PANIC 2014-02-18 18:50:32 +01:00
Miauw
9d74d4c840 i save the fucking day and replace a single u_equip into unEquip 2014-02-18 18:23:37 +01:00
Miauw
3b24bb64f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP 
Conflicts:
	code/modules/mob/transform_procs.dm
 2014-02-18 18:22:40 +01:00
Miauw
65db954b38 Fixed misc complaints about NODROP 2014-02-18 18:17:55 +01:00
Mercenaryblue
8f2ba65d9b Sprites for the LaserTag Helmets added. 
Issue #2684 Fixed.
Thanks to Aranclanos for helping me out.
 2014-02-18 06:02:50 -05:00
YotaXP
ee58c42570 Long overdue fixes to the Polaroid cameras. 
- Mobs lying down are captured properly.
- Hair and other coloring is captured properly.
- Darkness is now captured, though other area effects are not.
- Object layering is much more accurate, though still not perfect.
- Objects that were missing should now be visible.
- Objects that should not have been visible should now be gone.
- Some objects (like blood trails) are not yet captured properly.
 2014-02-17 21:41:56 -05:00
Ccomp5950
fdc0a26b00 Removed extra overlays length check. 
No reason to do that if we're doing it again 2 lines down.
 2014-02-17 19:07:53 -06:00
Razharas
ea7318985d Merge pull request #2714 from Ergovisavi/asteroid_overhaul 
[MAP] Asteroid/Mining Overhaul
 2014-02-17 16:44:46 -08:00
Hornygranny
2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
WitheredGryphon
e1ec5cf54f Fixes major security exploit regarding JavaScript injection. 2014-02-17 12:53:41 -05:00
Aranclanos
b78c7eca06 Merge pull request #2809 from hornygranny/throwspeed 
throwspeed pass
 2014-02-17 06:26:06 -02:00
Ergovisavi
1749d38d56 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul 
Fixed possible runtime issue with Jaunters, fixed merge issues, changed mining points to examine from attack self
 2014-02-16 19:36:48 -08:00
Ccomp5950
91fbd0ef88 Code effeciency project: apc icon_update() 
caching the icon states instead of creating them each time
checking to see if any icon_state or overlay changes and only
applying the ones that do.
 2014-02-16 12:17:41 -06:00
Razharas
b198ea5c9a Merge pull request #2795 from AnturK/machinegunqueen 
Fix for neurotox machine gun queens
 2014-02-16 08:45:16 -08:00
Razharas
be73e9d09f Merge pull request #2771 from fleure/eggs 
Increased egg hatch rate and reduced chicks in crate
 2014-02-16 08:37:49 -08:00
Razharas
923f8fc565 Merge pull request #2800 from MrPerson/del_in_progress 
Only report emitter/SMES deletion if the round's in progress.
 2014-02-16 08:36:25 -08:00
Razharas
b48efdaed0 Merge pull request #2761 from Incoming5643/blobjob 
Blobize edge case fix
 2014-02-16 08:28:46 -08:00
fleure
e6269beb3f Merge pull request #2782 from Aranclanos/jobmasterruntime 
Small runtime fix, job preference change before setup
 2014-02-16 14:36:21 +00:00
fleure
aead3ee208 Merge pull request #2770 from Aranclanos/singularitynomnom 
singularity spawn() runtimes
 2014-02-16 14:30:47 +00:00
fleure
30d5da6205 Merge pull request #2769 from Aranclanos/handcuffedhands 
you can't give items to people handcuffed.
 2014-02-16 14:26:52 +00:00
Razharas
f31654b499 Merge pull request #2700 from Incoming5643/statuesarecool 
Animate statues in magic stuff/Staff of Change rebalance
 2014-02-16 00:38:47 -08:00
Hornygranny
9d3f8f6a2d second pass 2014-02-15 20:11:12 -08:00
Hornygranny
9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
MrPerson
68ad6f352f Merge pull request #2768 from Rockdtben/removeUnusedRadarVar 
Removed two unused variables.
 2014-02-15 19:13:13 -08:00
Perakp
b9aa674ac5 - You don't need to hide the mob when showing an animation of it changing. 2014-02-15 23:18:09 +02:00
Perakp
befbec249e - Adds Iatot's animations from standard cyborg to other cyborg modules. 
- Toiletbot (Service borg Kent) not included.
- Renamed some cyborg sprites in robots.dmi so they make more sense/ are easier to work with.
 2014-02-15 20:58:11 +02:00
Miauw
3f9bf15ca5 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP 
Conflicts:
	code/modules/mob/mob.dm
 2014-02-15 17:30:21 +01:00
Aranclanos
663d8c2632 Merge pull request #2778 from hornygranny/throwfarce 
Rebalanced strange throwforces
 2014-02-15 14:14:48 -02:00
Miauw
7354305c80 ALRIGHT WE'RE DONE NOW FOR REAL THIS TIME 2014-02-15 17:06:25 +01:00
Miauw
831f23f820 now it's finished entirely \o/ 2014-02-15 16:56:12 +01:00
Razharas
cd1a54bbd9 Merge pull request #2699 from metaglog/chemmaster_drugfactory 
Adds a new option to the Chemmaster 3000 to mass-produce pills
 2014-02-15 06:37:08 -08:00
fleure
e0f74d0449 Merge pull request #2762 from Incoming5643/crushacanforjayowen 
Jay Owen demands that this pull be merged
 2014-02-15 10:26:26 +00:00
MrPerson
c551018db2 Only report emitter/SMES deletion if the round's in progress. Should mean less log/message spam because of the emitter crate. 2014-02-15 00:18:10 -08:00
Ergovisavi
0c79888f32 Changed plasma to not spawn so often, but now shows up on analyzer ping and grants more points. Reduced effectiveness of "Window shopping" on the asteroid by surrounding random mineral turfs in no-chance turfs. Changed the mining locker's sprite to something else, courtesy of Jordie0608. 2014-02-14 18:30:19 -08:00
AnturK
cf2d12771f Fix for neurotox machine gun queens 2014-02-15 00:51:33 +01:00
Perakp
1004235a28 Added feedback when you give spells to mindless mobs. 2014-02-14 21:47:41 +02:00