cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,192 Commits 61 Branches 14 Tags
449c3655da3f53ddddb512b6069cdfbfc0d8b049
Commit Graph

2505 Commits

Author SHA1 Message Date
Miauw62
24e1e89afb Merge pull request #3260 from Incoming5643/Realism 
Minor fix to improve realism
 2014-04-01 19:55:33 +02:00
Incoming
af47580b20 Humans Named John McClane can crawl through the vents. 
This helps increase realism and believability in our 2D spessman games.
 2014-04-01 12:45:28 -04:00
Razharas
f618fe556e Merge pull request #3241 from Miauw62/aprilfools2014ian 
April fools
 2014-04-01 05:54:22 -07:00
Cheridan
302f2ea122 Merge pull request #3215 from MrStonedOne/silicon-macros-and-hotkeys 
Gives cyborgs ai click shortcuts, adds some click shortcuts, and gives borgs more meaningful hotkeys
 2014-04-01 01:27:39 -05:00
Aranclanos
6c1150dca3 Merge pull request #3143 from Malkevin/saccult 
Sacrifice Cult
 2014-04-01 02:18:39 -03:00
MrStonedOne
25fe463eb2 Ensures re-humaned cyborgs get normal macros. 2014-03-31 22:04:33 -07:00
Cheridan
222f769b0c Merge pull request #3091 from Incoming5643/diehardwithaventgeance 
Fixes #3084
 2014-03-31 21:39:32 -05:00
Malkevin
a35f993c69 Changed the fast move code from a bunch of has_reagents checks to a bitflag check. 
The reagents turn on the flag per on_mob_life proc run, the flag is turned off if a check for the reagents fails, the check is called when reagents are deleted
 2014-04-01 00:50:42 +01:00
Malkevin
0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
Incoming
335c4591ad Just uses Login() 2014-03-31 13:30:19 -04:00
Razharas
d1fbcf2457 Merge pull request #3227 from fleure/tankfix 
Watertank nozzles no longer delete
 2014-03-31 09:48:57 -07:00
Miauw
83176c5ee2 improves le corgis immensely xd 2014-03-30 20:06:06 +02:00
Malkevin
d4e0052d03 mob.dm 2014-03-29 17:05:34 +00:00
Malkevin
c3552606f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-29 16:59:14 +00:00
Razharas
6cb3ae5183 Revert "Merge pull request #3142 from Alek2ander/master" 
This reverts commit 6f9b58abce, reversing
changes made to eda7110a23.

Im so sorry aran, so sorry
 2014-03-29 18:02:54 +04:00
Razharas
e63a01aff0 Merge pull request #3220 from Rockdtben/fixFollowBug 
Fixes #2852
 2014-03-29 06:26:06 -07:00
Razharas
6f9b58abce Merge pull request #3142 from Alek2ander/master 
pAI remote computer control
 2014-03-29 06:18:22 -07:00
fleure
c55ddd9d70 Watertank nozzles no longer delete 2014-03-29 12:35:58 +00:00
Cheridan
c8da962b40 Merge pull request #3195 from MrPerson/qdel_ei_nath_REDO 
Make ei nath not destroy brains again
 2014-03-28 13:03:11 -05:00
Rockdtben
5f54c9535b Fixes #2852 2014-03-28 07:59:15 -05:00
Malkevin
3ff519cefc Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-28 10:51:48 +00:00
Razharas
3000586e7b Merge pull request #3216 from Aranclanos/ClickDownRemoval2 
Click cooldown removal take 2
 2014-03-28 02:39:25 -07:00
Aranclanos
7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds. 
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
 2014-03-28 06:32:47 -03:00
MrStonedOne
a26b2252a0 borgified hotkeys for borg players 
changed:
1-3 = module select/toggle
4 = toggle intent
q = unequip active module

changed hotkey help to reflect this for borg players.
 2014-03-27 20:58:55 -07:00
YotaXP
febfa4d1e5 Merge branch 'qdel-with-datums' 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/controllers/garbage.dm
	code/game/atoms.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/mob/mob.dm
 2014-03-27 21:46:53 -04:00
Alek2ander
006a7e2d40 Removed pAI check in attack_hand 
Added pAI check in the Security Camera Console instead.
All the others seem fine.
 2014-03-27 19:16:16 +04:00
Alek2ander
358ecf7e6a Merge branch 'master' of https://github.com/tgstation/-tg-station into tgstation-master 
Conflicts:
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/telecrystalconsoles.dm
 2014-03-27 18:31:11 +04:00
Malkevin
cd6c1272ad Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-27 13:18:46 +00:00
Aranclanos
0b1ba613b6 Merge pull request #3177 from phil235/earmuffsfix 
Fixing being able to hear with earmuffs on.
 2014-03-27 06:52:43 -03:00
Malkevin
96a892cacc Removed some debug check 
Fixed the Debugger not selecting antags
 2014-03-26 19:49:14 +00:00
Malkevin
5257a2d3b5 -Made Ian sacrifice less of a "Hey fuck you die". 
-Made it so that each of the three cultists in live sacrifice get a word, to reward team work
-Made hell water not as deadly
 2014-03-26 19:26:28 +00:00
Malkevin
990ed20873 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-26 18:38:07 +00:00
MrPerson
1fa3dbde0c Make ei nath not destroy brains 
Also small tweaks to make spells GC if you use the spellremove() proc.
 2014-03-26 08:38:26 -07:00
phil235
9701dd16ae Only checking for earmuffs once. 2014-03-26 15:10:08 +01:00
Aranclanos
eded7cf127 Merge pull request #3181 from MrPerson/qdel_DEL_THE_MOBS 
Make most mobs del() instead of trying to GC them.
 2014-03-26 03:37:31 -03:00
Nienhaus
2b168b3ddb Genderless 2014-03-25 10:47:56 -05:00
MrPerson
667a773553 Make most mobs del() instead of trying to GC them. 
Don't try to Destroy() objects that get del(). It was causing infinite loops and other problems. It's now ok to have something call del(src) as part of Destroy().
 2014-03-25 08:44:40 -07:00
Nienhaus
1d01d07ade New Hair 
Adds a side pony tail, longer over the eye hair, a braid along with a
front braid, a bun, an ahoge, pig tails, and a over used anime protag
hair style.
DMI of the new hair. http://puu.sh/7IAKi.dmi
 2014-03-25 09:19:20 -05:00
Incoming
6b83a8d2e0 I am crying. 
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue

Conflicts:
	code/game/objects/structures/crates_lockers/closets/statue.dm
	code/modules/mob/living/simple_animal/hostile/statue.dm
	code/modules/projectiles/projectile/magic.dm
	tgstation.dme
 2014-03-24 22:13:43 -04:00
phil235
cc50291765 missed a parenthesis 2014-03-25 03:11:05 +01:00
phil235
3695a916ea Fixing being able to hear with earmuffs on. 
I hope I didn't make any mistake, this should prevent ear_deaf from flickering between 0 and 1 while wearing earmuffs.
 2014-03-25 02:58:47 +01:00
Aranclanos
9e9dc34ecf Merge pull request #3163 from Mloc/tg-eol 
proper crlf forcing
 2014-03-24 22:47:13 -03:00
fleure
43a6e111c5 Merge pull request #3118 from VistaPOWA/cyborg_module_in_telecomms 
Adds the Cyborg module into the messages received by the AI
 2014-03-24 15:08:25 +00:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-03-24 08:53:40 +00:00
YotaXP
3656217c29 Modified qdel() to accept any datum. 
The garbage controller no longer bothers nulling out every variable on destroyed objects.
An object can opt to not be collected by returning true from Destroy().  Useful for pools or other edge cases.
Fixed boxes not being collected, along with a couple other things.
Turfs will not be monitored for collection.
generate_ion_law() is no longer a /datum proc, and I am an admin in the repo.  Deal with it.
 2014-03-24 00:10:43 -04:00
Incoming
bab77f2538 Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-03-23 12:08:33 -04:00
Incoming
5035820e9c fixes me being stupid and not setting creator right 
Now for the conflicts...
 2014-03-23 11:53:38 -04:00
Alek2ander
5a3b654302 More sanity checks 
pAI interface is weird, let's make sure we're always in a valid state
 2014-03-23 13:49:10 +04:00
Alek2ander
223e5f7478 Arcades, overlays and Git being evil 
Added the most important damn checks of this entire PR that got eaten by
Git when I synced
Added a visual indication of a pAI being paired with a computer - a tiny
blue light at the bottom
Forbid to pair with computers that have non-standard icons, except the
arcade machine.
When the arcade is emagged, if the pAI loses, it will explode like a
detonated PDA. If it's slotted into a PDA, it will explode with it.
Severs connection if the pAI and the computer are on different z-levels
 2014-03-23 12:39:13 +04:00
Malkevin
dc05ad6210 Added a scaling system. 
6 starting cultists below 30 players and 9 above, escape objective is 10 for below 30 players and 15 for above.

HoP is restricted from becoming a cultist.

qdels

reduced supply talisman uses from 5 to 3

fixed typo in corgi sac_act
 2014-03-23 03:40:13 +00:00